wangxianzhang
|
8a3c4aa667
|
Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
aed2a4ce70
|
-
|
3 years ago |
|
wangxianzhang
|
287da72774
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
yinzuomei
|
401cb5a642
|
LambdaUpdateWrapper
|
3 years ago |
|
yinzuomei
|
ac775efdfe
|
zhushi
|
3 years ago |
|
wangxianzhang
|
1f689bbad4
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
yinzuomei
|
3ff3db3f05
|
未做核酸比对，接口返回internalRemark
|
3 years ago |
|
yinzuomei
|
763752c586
|
未做核酸比对，接口返回internalRemark
|
3 years ago |
|
yinzuomei
|
16cd5b4ea4
|
edit
|
3 years ago |
|
wangxianzhang
|
60e91744d1
|
居民信息导入，增加日志打印
|
3 years ago |
|
wangxianzhang
|
63dec04110
|
居民信息导入，增加打印listRemoteOptions()->ColumnWrapper
|
3 years ago |
|
wangxianzhang
|
ffc7ee14e9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
zxc
|
9064d1ca46
|
疫苗接种信息本地居民
|
3 years ago |
|
yinzuomei
|
3fa07f5569
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_compare_data
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
|
3 years ago |
|
zxc
|
0ded1143e3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
zxc
|
d02b0fb650
|
是否本地居民的pids修改
|
3 years ago |
sunyuchao
|
9cce2df712
|
历史数据赋值
|
3 years ago |
|
zxc
|
f7e96ebfad
|
emm
|
3 years ago |
|
zxc
|
32fe851abe
|
疫苗接种定时任务
|
3 years ago |
|
zxc
|
8fef98a908
|
疫苗接种同步按钮-todo
|
3 years ago |
|
sunyuchao
|
f57a120d0f
|
疫苗接种记录增加是否本辖区居民字段
|
3 years ago |
|
zxc
|
40f066d454
|
疫苗接种同步按钮
|
3 years ago |
|
zxc
|
f282ab0914
|
疫苗接种拉取暂提
|
3 years ago |
|
wangxianzhang
|
b99b276753
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
feb02f4b2f
|
为了提升导入居民效率，去掉分布式锁，限制修改小区的那个
|
3 years ago |
|
yinzuomei
|
f85caf497e
|
Merge remote-tracking branch 'origin/dev_compare_data'
|
3 years ago |
|
yinzuomei
|
8885726d7c
|
Merge remote-tracking branch 'origin_elink/master'
|
3 years ago |
|
yinzuomei
|
5293be77d2
|
Merge remote-tracking branch 'origin/dev_tripreport'
|
3 years ago |
|
yinzuomei
|
2f0385d9e6
|
Merge remote-tracking branch 'origin/dev_tripreport1109'
|
3 years ago |
|
yinzuomei
|
1aa8b15300
|
getExistUserByHouseIds 恢复
|
3 years ago |
|
wangxianzhang
|
9bbbe02c97
|
Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
3 years ago |
|
wangxianzhang
|
599b378e79
|
给许多options接口加缓存，10s有效期，明天应该有起效。所以，有些东西，比如网格，小区，字典表，如果增加、删除、修改了数据，可能要过个几秒钟，接口中的新数据才会生效
|
3 years ago |
|
wangxianzhang
|
fbace57888
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
fd6827672d
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
0dc9874440
|
时间类型转换
|
3 years ago |
|
wangxianzhang
|
d182aa5f59
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
d7a67fbd22
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
ae8e8b9db5
|
getExistUserByHouseIds
|
3 years ago |
|
yinzuomei
|
28ccffcabc
|
address
|
3 years ago |
|
sunyuchao
|
ee78cffdd1
|
.
|
3 years ago |
|
wangxianzhang
|
8248f0ffb3
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
yinzuomei
|
88e941fdcf
|
未做核酸比对调整改为视图查询
|
3 years ago |
|
sunyuchao
|
fd5c29bd23
|
姓名
|
3 years ago |
|
sunyuchao
|
9f4c3f2dfb
|
磐石是否落地检是否到达曹县改为非必填
|
3 years ago |
|
sunyuchao
|
25507d8f1e
|
磐石新增时默认赋值上报时间
|
3 years ago |
|
sunyuchao
|
f7bd7b655b
|
改一下测磐石
|
3 years ago |
|
yinzuomei
|
69f8a3e9db
|
注释
|
3 years ago |
|
sunyuchao
|
0f82049a56
|
磐石导入导出新增列表详情均增加7天途径地，导入对下拉框字段值校验正确性
|
3 years ago |
|
yinzuomei
|
a11c7f9207
|
gov/access/govrole/page分也不好使也没人发现哎
|
3 years ago |
|
sunyuchao
|
4c4cc55821
|
返参增加上报人姓名，列表增加隔离状态筛选条件
|
3 years ago |
