wangxianzhang
|
019dd5b040
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
f94dfb5a82
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
e9a2517206
|
改错了啊啊啊
|
3 years ago |
|
wangxianzhang
|
297c200118
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
52a1a97356
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
9ab3f3396a
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
|
wangxianzhang
|
6979f590e7
|
改错了啊啊啊
|
3 years ago |
jianjun
|
a3399d0cc0
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
|
jianjun
|
e7971fbbbc
|
导出方法
|
3 years ago |
zxc
|
f5b145e0b5
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
a8a0154bd5
|
emm
|
3 years ago |
|
zxc
|
851524fc1b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
bf55425e7a
|
Merge branch 'wxz_resiimport_temp' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
3 years ago |
|
zxc
|
ed2033d26d
|
房屋导入修改，存在的更新
|
3 years ago |
|
wangxianzhang
|
759ada7236
|
去掉compose文件中注释掉的image:内容
|
3 years ago |
|
jianjun
|
6778b9da7b
|
添加注释
|
3 years ago |
yinzuomei
|
1c75cc55ea
|
居民录入标签顺序调整为：身份证号、性别、出生日期。
|
3 years ago |
|
wangxianzhang
|
85ab5acd0a
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
bf58a70776
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
jianjun
|
38c55669a2
|
房屋添加接口去掉房主必填版本冲突
|
3 years ago |
|
wangxianzhang
|
79b5552531
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
329a1b422c
|
flyway编号修改
|
3 years ago |
|
wangxianzhang
|
4b250be3cf
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
51df190253
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
|
wangxianzhang
|
9bc9b52705
|
居民信息列表表头 所属房屋 修改
|
3 years ago |
|
zxc
|
caa7b4b4b2
|
import 错误信息重复
|
3 years ago |
|
jianjun
|
bd74456861
|
房屋添加接口去掉房主必填
|
3 years ago |
|
jianjun
|
3728132639
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
|
jianjun
|
5bb10bda1b
|
房屋去掉房主必填脚本
|
3 years ago |
|
yinzuomei
|
6ced9dbd0e
|
列表中性别、身份证号、出生日期的填写顺序调整为身份证号、性别、出生日期
|
3 years ago |
|
wangxianzhang
|
6db890c873
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
e505c9d5ee
|
去掉脚本
|
3 years ago |
|
zxc
|
e5be013892
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
zxc
|
4cb11982d1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
2b9de61853
|
import
|
3 years ago |
|
wangxianzhang
|
35e68b5b86
|
Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
397bcaca2f
|
户号-》房间号
|
3 years ago |
|
wangxianzhang
|
37e392bc2c
|
去掉多余flyway
|
3 years ago |
|
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
|
b2972193ea
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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 |
