zxc
|
2e3a26c863
|
代码生成
|
4 years ago |
|
zxc
|
c36267bdb9
|
代码生成
|
4 years ago |
sunyuchao
|
7500eb04df
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
sunyuchao
|
8e20669c2c
|
居民端我的上报增加返参
|
4 years ago |
|
sunyuchao
|
fdc4c2621b
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
sunyuchao
|
750ebf0d06
|
居民端我的上报增加返参
|
4 years ago |
wangxianzhang
|
338f086f49
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
a339bc561f
|
生产环境compose文件，替换为version_placeholder
|
4 years ago |
|
zxc
|
cc0155d913
|
放重复提交注解添加，申请接口和审核接口
|
4 years ago |
zhaoqifeng
|
b0be28ab43
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
zhaoqifeng
|
2b4972e789
|
批量发送通知bug修改
|
4 years ago |
|
zhaoqifeng
|
ebd53fb8b2
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
zhaoqifeng
|
ed6dc1a27e
|
批量发送通知bug修改
|
4 years ago |
|
zhaoqifeng
|
952b133fa5
|
批量发送通知bug修改
|
4 years ago |
jianjun
|
9ee1dc2b21
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
65b05bd569
|
Revert "添加个条件"
This reverts commit 58fc9808
|
4 years ago |
|
jianjun
|
53e2416cec
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
d1d8a9f3b8
|
初始化工作日->废弃服务内部调用的定时 添加脚本
|
4 years ago |
|
jianjun
|
43308f84a2
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
54df561383
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
f74805ea21
|
初始化工作日->废弃服务内部调用的定时 方法改为post
|
4 years ago |
|
jianjun
|
cd9b26f80e
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
1bba4f6149
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
e7f3872c7d
|
初始化工作日->废弃服务内部调用的定时
|
4 years ago |
|
zhaoqifeng
|
e324e45a86
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
zhaoqifeng
|
5f9c9d8009
|
批量发送通知bug修改
|
4 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
|
4 years ago |
|
jianjun
|
99919895be
|
bug
|
4 years ago |
|
jianjun
|
cd15a10e72
|
Revert "主键冲突 服务发布"
This reverts commit 7b8e3907
|
4 years ago |
|
jianjun
|
7b8e3907c9
|
主键冲突 服务发布
|
4 years ago |
|
jianjun
|
059d54207f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
yinzuomei
|
c1ff5763a1
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
4 years ago |
|
yinzuomei
|
46862b8fad
|
形成上报查询
|
4 years ago |
|
yinzuomei
|
1451f529ba
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
4 years ago |
|
yinzuomei
|
fddb475e0a
|
形成上报查询
|
4 years ago |
|
yinzuomei
|
700418d322
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
4 years ago |
|
yinzuomei
|
b72ecc6687
|
测试要测试
|
4 years ago |
|
wangxianzhang
|
1c5ab34b4d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
1bd8b75e8c
|
bug
|
4 years ago |
|
wangxianzhang
|
4178c25598
|
-
|
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
|
047a0a6138
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
e901f70541
|
emm bug
|
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
|
9c3969b85e
|
修复：-
|
4 years ago |
|
zhaoqifeng
|
4e125c0626
|
Merge branch 'dev_epidemic_situation' into develop
|
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 |
