jianjun
|
a7f62d3962
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
4 years ago |
|
jianjun
|
e75b110ac7
|
导入小区时 更新楼宇的房间数 up
|
4 years ago |
|
jianjun
|
004ea9cd76
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
4 years ago |
|
jianjun
|
eb97051ebd
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
4 years ago |
yinzuomei
|
c1a89965d7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
jianjun
|
a0eb799770
|
废弃网格+居民导入+房屋导入调整 up
|
4 years ago |
|
jianjun
|
09544847c1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
4 years ago |
|
jianjun
|
670ebd4913
|
修改版本号
|
4 years ago |
|
jianjun
|
b13f910f7d
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
|
4 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
|
4 years ago |
|
jianjun
|
583868b14d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
|
jianjun
|
b74a7d5ab1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
ca40bfca12
|
grid缓存不对添加组织名称
|
4 years ago |
|
jianjun
|
f8d9e871fb
|
grid缓存不对
|
4 years ago |
zxc
|
e7dbb236b8
|
注释更新户数
|
4 years ago |
|
jianjun
|
14fe68ac54
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
546cb7d6fe
|
grid缓存不对
|
4 years ago |
|
jianjun
|
77068a4714
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
jianjun
|
020df4166f
|
去掉房屋必须填写的 房主信息
|
4 years ago |
wangxianzhang
|
e9a2517206
|
改错了啊啊啊
|
4 years ago |
|
wangxianzhang
|
9ab3f3396a
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
wangxianzhang
|
6979f590e7
|
改错了啊啊啊
|
4 years ago |
|
jianjun
|
a3399d0cc0
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
jianjun
|
e7971fbbbc
|
导出方法
|
4 years ago |
|
zxc
|
ed2033d26d
|
房屋导入修改，存在的更新
|
4 years ago |
|
wangxianzhang
|
185c19bf23
|
版本升级 测试compose文件取版本号
|
4 years ago |
|
wangxianzhang
|
edbf11a78f
|
版本升级 测试compose文件取版本号
|
4 years ago |
|
wangxianzhang
|
429fc93b95
|
Merge remote-tracking branch 'origin/master'
|
4 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
|
4 years ago |
|
wangxianzhang
|
759ada7236
|
去掉compose文件中注释掉的image:内容
|
4 years ago |
|
jianjun
|
6778b9da7b
|
添加注释
|
4 years ago |
|
yinzuomei
|
1c75cc55ea
|
居民录入标签顺序调整为：身份证号、性别、出生日期。
|
4 years ago |
|
jianjun
|
38c55669a2
|
房屋添加接口去掉房主必填版本冲突
|
4 years ago |
|
wangxianzhang
|
329a1b422c
|
flyway编号修改
|
4 years ago |
|
wangxianzhang
|
51df190253
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
wangxianzhang
|
9bc9b52705
|
居民信息列表表头 所属房屋 修改
|
4 years ago |
|
zxc
|
caa7b4b4b2
|
import 错误信息重复
|
4 years ago |
|
jianjun
|
bd74456861
|
房屋添加接口去掉房主必填
|
4 years ago |
|
jianjun
|
3728132639
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
4 years ago |
|
jianjun
|
5bb10bda1b
|
房屋去掉房主必填脚本
|
4 years ago |
|
yinzuomei
|
6ced9dbd0e
|
列表中性别、身份证号、出生日期的填写顺序调整为身份证号、性别、出生日期
|
4 years ago |
|
wangxianzhang
|
e505c9d5ee
|
去掉脚本
|
4 years ago |
|
zxc
|
2b9de61853
|
import
|
4 years ago |
|
wangxianzhang
|
397bcaca2f
|
户号-》房间号
|
4 years ago |
|
wangxianzhang
|
2f3b1a8da8
|
修改：
1.居民导入-》户号
|
4 years ago |
