jianjun
|
e7f3872c7d
|
初始化工作日->废弃服务内部调用的定时
|
3 years ago |
zhaoqifeng
|
c0867d6e40
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
zhaoqifeng
|
e324e45a86
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
zhaoqifeng
|
5f9c9d8009
|
批量发送通知bug修改
|
3 years ago |
|
jianjun
|
948251f3f2
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java
|
3 years ago |
|
jianjun
|
99919895be
|
bug
|
3 years ago |
|
jianjun
|
cd15a10e72
|
Revert "主键冲突 服务发布"
This reverts commit 7b8e3907
|
3 years ago |
|
jianjun
|
7b8e3907c9
|
主键冲突 服务发布
|
3 years ago |
|
jianjun
|
059d54207f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
yinzuomei
|
473883d01c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
c1ff5763a1
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
46862b8fad
|
形成上报查询
|
3 years ago |
|
yinzuomei
|
4f15ed4dd5
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
1451f529ba
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
fddb475e0a
|
形成上报查询
|
3 years ago |
|
yinzuomei
|
18c75de31f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
700418d322
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
b72ecc6687
|
测试要测试
|
3 years ago |
|
jianjun
|
d32d5fedb1
|
Merge remote-tracking branch 'remotes/origin/dev' into 主线测试
|
3 years ago |
wangxianzhang
|
1c5ab34b4d
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jianjun
|
1bd8b75e8c
|
bug
|
3 years ago |
|
wangxianzhang
|
4178c25598
|
-
|
3 years ago |
|
jianjun
|
4317a567e8
|
Merge remote-tracking branch 'remotes/origin/develop' into 主线测试
|
3 years ago |
|
jianjun
|
4b0bbcc225
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 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
|
3 years ago |
|
jianjun
|
bfef176b33
|
监听居民信息变动 如果是删除或者新增 则更新是否居民状态
|
3 years ago |
zxc
|
5945a94b1d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
047a0a6138
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
e901f70541
|
emm bug
|
3 years ago |
|
zxc
|
116c5bc31c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
wangxianzhang
|
b5245a3e37
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
f4099e2197
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
9c3969b85e
|
修复：-
|
3 years ago |
|
zhaoqifeng
|
562cd7023b
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
zhaoqifeng
|
4e125c0626
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
wangxianzhang
|
b912971200
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
dad3dc59aa
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
wangxianzhang
|
bf7e7f4109
|
修复：-
|
3 years ago |
|
zhaoqifeng
|
29011bf20b
|
居民检索序号
|
3 years ago |
|
wangxianzhang
|
6019223cbc
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
143f6d4e9e
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
83e083d07c
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
wangxianzhang
|
25035f51bc
|
修复：-
|
3 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
|
3 years ago |
|
wangxianzhang
|
0fe66ea4f4
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
22433869f1
|
Merge branches 'develop' and 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
abeff79831
|
修复：-
|
3 years ago |
|
wangxianzhang
|
f40a26b057
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
5bbf5af198
|
修复：-
|
3 years ago |
sunyuchao
|
9549879d0a
|
Merge branch 'develop' into release_temp
|
3 years ago |
