yinzuomei
|
fc475bfc5d
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
9a474878fc
|
人户状况
|
3 years ago |
|
yinzuomei
|
3181da191e
|
Merge remote-tracking branch 'origin/dev_compare_data'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
yinzuomei
|
096bfb13f8
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
1405eac691
|
89__
|
3 years ago |
|
yinzuomei
|
5879763f78
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
wangxianzhang
|
b05bb82f44
|
解决疫苗接种的数据重复问题
|
3 years ago |
|
wangxianzhang
|
e09e955b6b
|
解决疫苗接种的数据重复问题
|
3 years ago |
zxc
|
fb97450752
|
人户列表
|
3 years ago |
|
zxc
|
ed5697aad2
|
改改名字
|
3 years ago |
|
wangxianzhang
|
599de384d9
|
解决疫苗接种的数据重复问题
|
3 years ago |
|
zxc
|
bdcf94109a
|
is
|
3 years ago |
|
zxc
|
e8e4112f36
|
人户状况
|
3 years ago |
|
zxc
|
88821961cd
|
人户状况
|
3 years ago |
|
wangxianzhang
|
0b0f5f4b6c
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
yinzuomei
|
08a3d213c7
|
企事业单位导入，错误excel
|
3 years ago |
sunyuchao
|
eaf7f0b9d1
|
核酸记录表增加非必填字段“试管编号” 对应产蛋4679
|
3 years ago |
|
zxc
|
c11e4ee226
|
人户状况
|
3 years ago |
|
zxc
|
246fa40527
|
rhzk
|
3 years ago |
|
sunyuchao
|
d3514a13fd
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
sunyuchao
|
3c72c57956
|
公安部接口调整
|
3 years ago |
|
wangxianzhang
|
16d8f81d0a
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
zxc
|
829e1c4e2d
|
字段赋值
|
3 years ago |
|
wangxianzhang
|
a211fcdbeb
|
疫苗接种逻辑错误
|
3 years ago |
|
wangxianzhang
|
c2bbc5808c
|
疫苗接种sql字段错误
|
3 years ago |
|
wangxianzhang
|
80cb29baa8
|
居民信息对比功能调整
|
3 years ago |
|
wangxianzhang
|
a16eaffdea
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
sunyuchao
|
52f9eded1c
|
增加排序条件
|
3 years ago |
|
sunyuchao
|
115ab0c605
|
更新数据状态
|
3 years ago |
|
sunyuchao
|
ed353fcbbc
|
状态
|
3 years ago |
|
sunyuchao
|
cc08fcbb8e
|
脚本
|
3 years ago |
|
sunyuchao
|
db9ae9dc19
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
sunyuchao
|
1a3403afb8
|
比对方法改为异步定时任务
|
3 years ago |
|
wangxianzhang
|
68b6546fcf
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
zxc
|
e18c105d9e
|
改成查表
|
3 years ago |
|
yinzuomei
|
9844445fba
|
网格缓存避免空指针
|
3 years ago |
|
yinzuomei
|
0f95e7f1d4
|
核酸比对，关系表改为 agency_id+compare_rec_id唯一2
|
3 years ago |
|
yinzuomei
|
89a5448d39
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
yinzuomei
|
d3a948d58a
|
核酸比对，关系表改为 agency_id+compare_rec_id唯一
|
3 years ago |
|
wangxianzhang
|
f48f1c6112
|
natInfoSyncButton改为submitSyncJob接口
|
3 years ago |
|
wangxianzhang
|
b787f42c57
|
natInfoSyncButton改为submitSyncJob接口
|
3 years ago |
|
wangxianzhang
|
0dc3e41ce4
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
sunyuchao
|
cd21a84cf4
|
列表
|
3 years ago |
|
sunyuchao
|
2e1bf306d8
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
sunyuchao
|
1d2b7b3f4b
|
赋默认值
|
3 years ago |
|
yinzuomei
|
ecd4407640
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
yinzuomei
|
40b433e282
|
导出剔除internalRemark
|
3 years ago |
|
sunyuchao
|
876a8e465a
|
条件追加
|
3 years ago |
|
sunyuchao
|
db2de3f7f4
|
居民信息比对
|
3 years ago |
|
wangxianzhang
|
8a3c4aa667
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
