wangxianzhang
|
8f1e4721ea
|
生产环境compose文件，替换为version_placeholder
|
3 years ago |
jianjun
|
32ab3d6f1f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
5f28334330
|
Revert "Revert "添加个条件""
This reverts commit 65b05bd5
|
3 years ago |
zxc
|
7b8eb0a229
|
resi-group
|
3 years ago |
|
zxc
|
c7645fac5d
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
zxc
|
cc0155d913
|
放重复提交注解添加，申请接口和审核接口
|
3 years ago |
|
wangxianzhang
|
0180484d22
|
修改compose文件版本为版本占位符，测试自动版本号
|
3 years ago |
|
jianjun
|
aed1bc2838
|
工作日任务调整 up
|
3 years ago |
|
jianjun
|
d462586eab
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
5639b476bc
|
版本升级
|
3 years ago |
|
wangxianzhang
|
8e94a181b4
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
zxc
|
a368be32db
|
版本号更改
|
3 years ago |
|
jianjun
|
adf2ad4f60
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
becaa8b550
|
gov-org up
|
3 years ago |
|
yinzuomei
|
ccd14d5c2a
|
Merge remote-tracking branch 'origin/dev'
|
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 |
|
yinzuomei
|
5155f7b38f
|
/gov/org/house/housedel内部调用/gov/org/house/delete
|
3 years ago |
|
sunyuchao
|
799341a62b
|
bug修改
|
3 years ago |
|
jianjun
|
7e6b5d1979
|
添加状态
|
3 years ago |
