zxc
|
df9579a902
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
e03a70c2e7
|
破bug
|
3 years ago |
yinzuomei
|
62e48a404a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
725702c0fd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
a270c45bff
|
commonservice/areacode/areacodedicttree
|
3 years ago |
jianjun
|
2e159a7d55
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
1cda42a52b
|
工作日默认初始化明天的
|
3 years ago |
|
jianjun
|
10b9a6869c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
ca15b91c91
|
工作日默认初始化明天的
|
3 years ago |
|
jianjun
|
8cff6204e3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
40d42a04e6
|
打印日志 删除e.printStackTrace()
|
3 years ago |
|
jianjun
|
da3f15259f
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jianjun
|
8383f41739
|
加强判断
|
3 years ago |
|
zxc
|
8d3779d9c8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
515363c340
|
导入添加长度限制
|
3 years ago |
wangxianzhang
|
338f086f49
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangxianzhang
|
a339bc561f
|
生产环境compose文件，替换为version_placeholder
|
3 years ago |
|
zxc
|
cc0155d913
|
放重复提交注解添加，申请接口和审核接口
|
3 years ago |
|
jianjun
|
65b05bd569
|
Revert "添加个条件"
This reverts commit 58fc9808
|
3 years ago |
|
jianjun
|
d1d8a9f3b8
|
初始化工作日->废弃服务内部调用的定时 添加脚本
|
3 years ago |
|
jianjun
|
43308f84a2
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
f74805ea21
|
初始化工作日->废弃服务内部调用的定时 方法改为post
|
3 years ago |
|
jianjun
|
e7f3872c7d
|
初始化工作日->废弃服务内部调用的定时
|
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 |
|
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
|
bfef176b33
|
监听居民信息变动 如果是删除或者新增 则更新是否居民状态
|
3 years ago |
|
zxc
|
e901f70541
|
emm bug
|
3 years ago |
|
wangxianzhang
|
9c3969b85e
|
修复：-
|
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
|
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
|
abeff79831
|
修复：-
|
3 years ago |
|
wangxianzhang
|
5bbf5af198
|
修复：-
|
3 years ago |
sunyuchao
|
afe68a52d7
|
列表增加排序、表增加查询用索引
|
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
|
02525ad799
|
zhushixia
|
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
|
c2d920b192
|
修复：1.核酸检测导入，去掉检测地点必填校验；2.没有错误/提示行，不下载描述文件
|
3 years ago |
