wangxianzhang
|
37b5990291
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
2f3b1a8da8
|
修改：
1.居民导入-》户号
|
3 years ago |
|
wangxianzhang
|
1d70734941
|
修改：
1.居民导入-》户号
|
3 years ago |
jianjun
|
a559948c33
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
7a3b3b457b
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
77176c0bf4
|
feign trix配置线程池参数
|
3 years ago |
yinzuomei
|
b94473a770
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
5d131496bf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
|
3 years ago |
|
yinzuomei
|
e16c68732b
|
报事人大代表和报给组织，pids调整
|
3 years ago |
|
jianjun
|
a76bbb5ada
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
2bffec01ec
|
导入房间报错
|
3 years ago |
|
yinzuomei
|
a61b78ab8d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
3a0cf66e63
|
/gov/org/agency/editagency修改组织信息bugfix2
|
3 years ago |
|
yinzuomei
|
756f3de996
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
16cab43752
|
/gov/org/agency/editagency修改组织信息bugfix
|
3 years ago |
|
wangxianzhang
|
656e49e0c9
|
去掉/wechatthird/componentaccesstoken中将accesstoken推送到私有化平台的操作
|
3 years ago |
zhaoqifeng
|
150593ae62
|
Merge branch 'dev_memo' into dev
|
3 years ago |
|
yinzuomei
|
f8b22941a3
|
Merge remote-tracking branch 'origin/dev_qr_code' into dev
|
3 years ago |
|
yinzuomei
|
0fa011430a
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
4030e4aa52
|
居民信息采集导出
|
3 years ago |
zxc
|
384ae1d21a
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
zxc
|
a13d88ca4e
|
微调
|
3 years ago |
|
yinzuomei
|
dcf1c28fe5
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
yinzuomei
|
a6d901fc09
|
Merge remote-tracking branch 'origin/dev_qr_code' into dev
|
3 years ago |
|
yinzuomei
|
992fbd7038
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
86149f8029
|
采集信息：身份证号或者姓名不为空时插入
|
3 years ago |
sunyuchao
|
dbdb0439a8
|
Merge remote-tracking branch 'origin/dev_memo' into develop
|
3 years ago |
|
zhaoqifeng
|
58cf7de168
|
修改
|
3 years ago |
|
sunyuchao
|
ec0dacad9d
|
Merge branch 'dev_memo' into develop
|
3 years ago |
|
sunyuchao
|
3c9dafe7ac
|
bug修改
|
3 years ago |
|
sunyuchao
|
908ce8a535
|
Merge branch 'dev_memo' into develop
|
3 years ago |
|
sunyuchao
|
5185c56f25
|
Merge remote-tracking branch 'origin/dev_memo' into dev_memo
|
3 years ago |
|
sunyuchao
|
243ffaa73f
|
bug修改
|
3 years ago |
|
wangxianzhang
|
5258cc1e54
|
Merge branch 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
a966dd98a5
|
书记日志-人员关怀-导出word状态判断错误
|
3 years ago |
|
zxc
|
ae746e38fa
|
Merge branch 'dev_abandon_grid' into develop
|
3 years ago |
|
zxc
|
2b1f4bf9e9
|
查询未结案项目状态
|
3 years ago |
|
jianjun
|
50f1e56116
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
|
jianjun
|
0ad43952f3
|
Merge remote-tracking branch 'remotes/origin/dev_qr_code' into develop
|
3 years ago |
|
jianjun
|
6e2620420b
|
导出居民收集信息
|
3 years ago |
|
zhaoqifeng
|
3f19b6ed21
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
zhaoqifeng
|
ecaecdf67d
|
治理指数办结效率和响应度
|
3 years ago |
|
yinzuomei
|
2c8a8743c2
|
Merge remote-tracking branch 'origin/dev_abandon_grid' into develop
|
3 years ago |
|
yinzuomei
|
c22edf30a1
|
废弃网格，前置判断项目
|
3 years ago |
|
zxc
|
cd9c0da401
|
Merge branch 'dev_abandon_grid' into develop
|
3 years ago |
|
zxc
|
6a02fd095b
|
查询未结案项目状态
|
3 years ago |
|
zxc
|
5e52b79d1d
|
Merge branch 'dev_abandon_grid' into develop
|
3 years ago |
|
zxc
|
373ac76d5f
|
查询未结案项目状态
|
3 years ago |
|
yinzuomei
|
256f38a6a9
|
项目管理-全部组织树，不展示废弃的网格
|
3 years ago |
|
yinzuomei
|
5b8bd39079
|
/heart/work/act/sponsorlist发布活动主办方不展示废弃的网格
|
3 years ago |
