jianjun
|
b9351a262d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
f2b8ab3ffc
|
巡查记录添加地址设置
|
4 years ago |
wangxianzhang
|
aafeb78854
|
Merge branch 'dev_resi_template_download' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
31aa37d650
|
新增：
1.ic居民信息导入所用excel模板下载
|
4 years ago |
zxc
|
2efeec31ed
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d8cefaf5de
|
来源网格的，已结案的项目，满意度分数默认80
|
4 years ago |
|
wangxianzhang
|
08322393ac
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
a406d0e22c
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
jianjun
|
0e58294aae
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
9dec466f4c
|
组织中心点位获取 up
|
4 years ago |
|
jianjun
|
f2b26d1e2f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3e0b7a4434
|
组织中心点位获取
|
4 years ago |
|
wangxianzhang
|
40cfae724a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
02002fe33f
|
修改居民excel导入后的文件名
|
4 years ago |
zhaoqifeng
|
f6b73d099b
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
22fa5550f7
|
治理指数统计修改
|
4 years ago |
|
jianjun
|
65c8ee4f22
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
5db2e6c3e6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3c278d2543
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
70ac51304c
|
难点堵点分数修改
满意度分数默认值80
|
4 years ago |
|
zhaoqifeng
|
1daa6270bb
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zxc
|
bfc6292071
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
13bd6e4340
|
难点堵点加分数字段
|
4 years ago |
sunyuchao
|
966c89bda1
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
9c115a708e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
e3e33c0b7f
|
应胡科家要求将平阴之前居民端热心居民改为网格员的在改回去，前期要求改的是胡小雷、林伟伟
|
4 years ago |
|
jianjun
|
11680926f8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
364955346a
|
删除模版
|
4 years ago |
|
zxc
|
9992e43e32
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
5527271138
|
难点堵点加分数字段
|
4 years ago |
yinzuomei
|
9bb0ac0dba
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e2127015c5
|
费钉钉
|
4 years ago |
|
wangxianzhang
|
1e44d01054
|
修改：修改居民信息导入成功和失败后，返回excel的文件名
|
4 years ago |
|
jianjun
|
0a3263a3cc
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
80b24f7d19
|
获取工作人员信息 从缓存获取 2.5
|
4 years ago |
|
jianjun
|
841e23cf24
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
36a396afda
|
获取工作人员信息 从缓存获取 2
|
4 years ago |
|
zhaoqifeng
|
78cf991f16
|
治理榜单查询修改
|
4 years ago |
|
jianjun
|
b80aacd996
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
jianjun
|
1ddada911c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
d50d40557d
|
获取工作人员信息 从缓存获取
|
4 years ago |
|
yinzuomei
|
5e6d007ed0
|
都正常返回了，没必要再发个error钉钉
|
4 years ago |
|
sunyuchao
|
70bafa0a71
|
市平台对接 mq只执行平阴数据
|
4 years ago |
|
yinzuomei
|
7ebb669f86
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
84510605d8
|
/gov/org/customergrid/getgridlistbygridids中error日志降为warn
|
4 years ago |
|
zhaoqifeng
|
8e53562673
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
5ebbd35276
|
治理指数统计修改
|
4 years ago |
|
jianjun
|
acddd3e675
|
Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into dev
|
4 years ago |
|
zxc
|
c73fd60ae1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3186b286cc
|
删除多余代码
|
4 years ago |
