sunyuchao
|
485c0afa7d
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
sunyuchao
|
afe68a52d7
|
列表增加排序、表增加查询用索引
|
3 years ago |
wangxianzhang
|
bb67f65df9
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
aa75b80cd4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
a5eec335b6
|
修复：1.核酸检测结果填入核酸检测地址导致sql报错的bug。
|
3 years ago |
yinzuomei
|
a93f0a9034
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
f28abd3c0d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
94c9fd984f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
yinzuomei
|
02525ad799
|
zhushixia
|
3 years ago |
jianjun
|
cf7ad12ca9
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
41641601b2
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
c6daedf45b
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
7e05c3abf6
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
6bea405d99
|
导出核酸错误
|
3 years ago |
|
jianjun
|
3630256dae
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
jianjun
|
58fc98085b
|
添加个条件
|
3 years ago |
|
wangxianzhang
|
b7ed2d72ee
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
2e0bb19ffd
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
yinzuomei
|
89f3eccb6e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
f8fdf99765
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
wangxianzhang
|
c2d920b192
|
修复：1.核酸检测导入，去掉检测地点必填校验；2.没有错误/提示行，不下载描述文件
|
3 years ago |
|
yinzuomei
|
5155f7b38f
|
/gov/org/house/housedel内部调用/gov/org/house/delete
|
3 years ago |
|
sunyuchao
|
8d6da55bb4
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
sunyuchao
|
97a54dc14f
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
sunyuchao
|
799341a62b
|
bug修改
|
3 years ago |
|
jianjun
|
13447fcc82
|
Merge remote-tracking branch 'origin/release_temp' into 主线测试
|
3 years ago |
|
jianjun
|
b46d0f0eb1
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
3c4c944523
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
f7a2d61235
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
7e6b5d1979
|
添加状态
|
3 years ago |
|
wangxianzhang
|
9e69898f90
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
d960748180
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
wangxianzhang
|
09d9b4d873
|
导入核酸检测：更新了，或者是跳过了，都算是成功的，只有出现异常，或者信息确实校验不通过，才算是失败
|
3 years ago |
|
yinzuomei
|
c5815997bd
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
816b83702e
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
0b9100a8ea
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
yinzuomei
|
d8f723a873
|
redis
|
3 years ago |
|
sunyuchao
|
614c10cfe4
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
sunyuchao
|
abfefbd0c0
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
sunyuchao
|
703abd3c6a
|
需求调整
|
3 years ago |
|
wangxianzhang
|
52ffe93fa3
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
5bfc310e9a
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
4f3a8de21a
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
wangxianzhang
|
6cbd70cc26
|
导入核酸检测：针对新需求重构
|
3 years ago |
|
jianjun
|
a1d26249f6
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
ea43f3b641
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
48a0c7a801
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into develop
|
3 years ago |
|
jianjun
|
cf1ad4719a
|
导出核酸检测
|
3 years ago |
|
sunyuchao
|
40c63baa03
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
sunyuchao
|
9a6911a1c4
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
