wangxianzhang
|
4178c25598
|
-
|
4 years ago |
jianjun
|
4317a567e8
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
4 years ago |
|
jianjun
|
4b0bbcc225
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
eb494e3c03
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
jianjun
|
bfef176b33
|
监听居民信息变动 如果是删除或者新增 则更新是否居民状态
|
4 years ago |
zxc
|
5945a94b1d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
047a0a6138
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e901f70541
|
emm bug
|
4 years ago |
|
zxc
|
116c5bc31c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
wangxianzhang
|
b5245a3e37
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
f4099e2197
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
9c3969b85e
|
修复：-
|
4 years ago |
zhaoqifeng
|
562cd7023b
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
4e125c0626
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
wangxianzhang
|
b912971200
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
dad3dc59aa
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
bf7e7f4109
|
修复：-
|
4 years ago |
|
zhaoqifeng
|
29011bf20b
|
居民检索序号
|
4 years ago |
|
wangxianzhang
|
6019223cbc
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
143f6d4e9e
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
83e083d07c
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
25035f51bc
|
修复：-
|
4 years ago |
yinzuomei
|
42fa7cdf95
|
Merge branches 'dev' and 'dev_epidemic_situation' of http://121.42.41.42:7070/r/epmet-cloud into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
0fe66ea4f4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
22433869f1
|
Merge branches 'develop' and 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
abeff79831
|
修复：-
|
4 years ago |
|
wangxianzhang
|
f40a26b057
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
5bbf5af198
|
修复：-
|
4 years ago |
sunyuchao
|
9549879d0a
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
485c0afa7d
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
sunyuchao
|
afe68a52d7
|
列表增加排序、表增加查询用索引
|
4 years ago |
|
wangxianzhang
|
bb67f65df9
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
aa75b80cd4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a5eec335b6
|
修复：1.核酸检测结果填入核酸检测地址导致sql报错的bug。
|
4 years ago |
|
yinzuomei
|
a93f0a9034
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
f28abd3c0d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
94c9fd984f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
02525ad799
|
zhushixia
|
4 years ago |
|
jianjun
|
cf7ad12ca9
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
41641601b2
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
c6daedf45b
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
7e05c3abf6
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
6bea405d99
|
导出核酸错误
|
4 years ago |
|
jianjun
|
3630256dae
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
jianjun
|
58fc98085b
|
添加个条件
|
4 years ago |
|
wangxianzhang
|
b7ed2d72ee
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
2e0bb19ffd
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
yinzuomei
|
89f3eccb6e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
f8fdf99765
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
wangxianzhang
|
c2d920b192
|
修复：1.核酸检测导入，去掉检测地点必填校验；2.没有错误/提示行，不下载描述文件
|
4 years ago |
