jianjun
|
a0eb799770
|
废弃网格+居民导入+房屋导入调整 up
|
3 years ago |
|
jianjun
|
09544847c1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
3 years ago |
|
jianjun
|
670ebd4913
|
修改版本号
|
3 years ago |
|
jianjun
|
b13f910f7d
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
3 years ago |
|
jianjun
|
403777271d
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
3 years ago |
|
jianjun
|
b74a7d5ab1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
ca40bfca12
|
grid缓存不对添加组织名称
|
3 years ago |
|
jianjun
|
f8d9e871fb
|
grid缓存不对
|
3 years ago |
|
jianjun
|
14fe68ac54
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
546cb7d6fe
|
grid缓存不对
|
3 years ago |
wangxianzhang
|
185c19bf23
|
版本升级 测试compose文件取版本号
|
3 years ago |
|
wangxianzhang
|
edbf11a78f
|
版本升级 测试compose文件取版本号
|
3 years ago |
|
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 |
zxc
|
caa7b4b4b2
|
import 错误信息重复
|
3 years ago |
|
zxc
|
2b9de61853
|
import
|
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 |
