wangxianzhang
|
429fc93b95
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
6d173d7e3b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
3 years ago |
|
wangxianzhang
|
759ada7236
|
去掉compose文件中注释掉的image:内容
|
3 years ago |
jianjun
|
67318a02ef
|
feign trix配置线程池参数 up
|
3 years ago |
|
jianjun
|
14226e5789
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
65956b71c2
|
报事人大代表和报给组织，pids调整 resi-home up
|
3 years ago |
|
yinzuomei
|
c2fda7949c
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
yinzuomei
|
b94473a770
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
e16c68732b
|
报事人大代表和报给组织，pids调整
|
3 years ago |
|
jianjun
|
7be40063a3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/pom.xml
|
3 years ago |
|
jianjun
|
6841aa32b2
|
导入房间报错 up
|
3 years ago |
|
jianjun
|
1145a5260b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
8c841f1a34
|
/gov/org/agency/editagency修改组织信息bugfix2 up
|
3 years ago |
|
yinzuomei
|
bf9297e998
|
Merge remote-tracking branch 'origin/dev'
|
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
|
1153a0e568
|
/gov/org/agency/editagency修改组织信息bugfix up
|
3 years ago |
|
yinzuomei
|
e59cf3d9dd
|
Merge remote-tracking branch 'origin/dev'
|
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
|
ff94332af3
|
版本升级
|
3 years ago |
|
wangxianzhang
|
ca76a4efae
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
656e49e0c9
|
去掉/wechatthird/componentaccesstoken中将accesstoken推送到私有化平台的操作
|
3 years ago |
|
yinzuomei
|
cb79fefb5f
|
忘了改版本号...
|
3 years ago |
zhaoqifeng
|
361a395829
|
书记日志
|
3 years ago |
|
zhaoqifeng
|
b957de9881
|
Merge branch 'dev'
|
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
|
4030e4aa52
|
居民信息采集导出
|
3 years ago |
zxc
|
a13d88ca4e
|
微调
|
3 years ago |
|
yinzuomei
|
53337ebea6
|
govorg,user：包含采集居民导出
|
3 years ago |
|
yinzuomei
|
00a074edb3
|
Merge remote-tracking branch 'origin/dev'
|
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
|
86149f8029
|
采集信息：身份证号或者姓名不为空时插入
|
3 years ago |
|
zhaoqifeng
|
58cf7de168
|
修改
|
3 years ago |
sunyuchao
|
3c9dafe7ac
|
bug修改
|
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
|
a966dd98a5
|
书记日志-人员关怀-导出word状态判断错误
|
3 years ago |
|
jianjun
|
6e2620420b
|
导出居民收集信息
|
3 years ago |
|
zhaoqifeng
|
4415b21d59
|
统计服务升级
|
3 years ago |
|
zhaoqifeng
|
5ba3c06d23
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
3f19b6ed21
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
zhaoqifeng
|
ecaecdf67d
|
治理指数办结效率和响应度
|
3 years ago |
