wangxianzhang
|
a3faae5bc5
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
3baa8b9e5c
|
修改
|
4 years ago |
|
wangxianzhang
|
52d19a051c
|
Merge remote-tracking branch 'origin/dev_memo' into dev_memo
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
|
4 years ago |
|
wangxianzhang
|
f52ab1b8d5
|
新增：
1.备忘录-人员关怀、难点堵点、工作日志的word导出接口
|
4 years ago |
sunyuchao
|
7a3c88a495
|
..
|
4 years ago |
|
sunyuchao
|
1f9dd227e5
|
..
|
4 years ago |
|
sunyuchao
|
c40df4938e
|
难点堵点
|
4 years ago |
zhaoqifeng
|
8dba635743
|
工作日志
|
4 years ago |
|
sunyuchao
|
7bef86dded
|
.
|
4 years ago |
|
sunyuchao
|
8a1bfb496c
|
错提代码
|
4 years ago |
|
sunyuchao
|
0663b09b34
|
书记日志-消息提醒弹框列表接口初版
|
4 years ago |
|
zhaoqifeng
|
2fe5ebbe59
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
30f35c723c
|
小区重名
|
4 years ago |
|
zhaoqifeng
|
d580806b63
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
a21c3790c7
|
小区重名
|
4 years ago |
yinzuomei
|
8b1803c7e8
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
|
4 years ago |
|
yinzuomei
|
44484685d5
|
warn
|
4 years ago |
zxc
|
fad96b2266
|
Merge branch 'dev_memo' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
4 years ago |
|
zxc
|
bed41c106b
|
党群服务中心删除
|
4 years ago |
jianjun
|
a649b13e97
|
测试下
|
4 years ago |
|
jianjun
|
151543ef6c
|
临时 加大feign核心线程数
|
4 years ago |
|
sunyuchao
|
79cec12400
|
数据日志代码生成
|
4 years ago |
|
jianjun
|
605c532b79
|
路径驼峰
|
4 years ago |
|
jianjun
|
2aa45e4dc5
|
mapingurl修改
|
4 years ago |
|
jianjun
|
8f0ea3e73c
|
修改巡查锁机制
|
4 years ago |
|
sunyuchao
|
1968bff922
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
sunyuchao
|
3e8bc953ea
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目 程序调整
|
4 years ago |
|
sunyuchao
|
5b455d287f
|
Merge branch 'dev_grid_project_stats_syc' into dev
|
4 years ago |
|
zhaoqifeng
|
e99c4d3ad3
|
Merge branch 'dev_work_event' into develop
|
4 years ago |
|
zhaoqifeng
|
4aea47ba2f
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
ed2e228306
|
项目网格统计程序调整，统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据，不在只是统计议题转的项目
|
4 years ago |
|
jianjun
|
89ae2fa567
|
备份生成模板
|
4 years ago |
|
zhaoqifeng
|
cfc2f94d6d
|
Merge branch 'dev_work_event' into develop
|
4 years ago |
|
zhaoqifeng
|
588031204c
|
项目增加work_event来源，为网格员上报事件，修改设计到的统计查询
|
4 years ago |
|
sunyuchao
|
4efd53bb10
|
网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有
|
4 years ago |
|
wangxianzhang
|
0ec8d05cf8
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
b748556401
|
-
|
4 years ago |
|
wangxianzhang
|
07927d5093
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
53f98c8c42
|
版本升级
|
4 years ago |
|
sunyuchao
|
4c056dfc39
|
Merge branch 'dev_grid_project_syc' into dev
|
4 years ago |
|
sunyuchao
|
fa02b87851
|
项目网格日统计 查询网格项目修改，网格的项目不再只是来源议题，也可以来源事件或者网格员上报事件，所以改查项目main表网格数据
|
4 years ago |
|
wangxianzhang
|
f33097be1c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
26a9de532e
|
修复：居民调动，detail表的type和typeName错误
|
4 years ago |
|
yinzuomei
|
617b136b3c
|
Merge remote-tracking branch 'origin/dev_warn_notice' into develop
|
4 years ago |
|
yinzuomei
|
c16f1fb805
|
feign url
|
4 years ago |
|
jianjun
|
ae535669fd
|
Merge remote-tracking branch 'remotes/origin/wxz_ttl' into 主线开发
|
4 years ago |
|
jianjun
|
e3be103e7e
|
错误日志 获取traceId
|
4 years ago |
|
wangxianzhang
|
b3dc077626
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e332c10133
|
居民信息导入模板更新
|
4 years ago |
|
wangxianzhang
|
a95b4b131d
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
