wangxianzhang
|
2cb9df4709
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
d23c07ef76
|
导入核酸检测excel url修改
|
4 years ago |
yinzuomei
|
caa1fa5408
|
表修改
|
4 years ago |
|
wangxianzhang
|
a16eff63c5
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_epidemic_situation
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
788f6b2671
|
初步完成核酸检测信息导入
|
4 years ago |
jianjun
|
9c8cb15b5f
|
导出核酸颜色
|
4 years ago |
zxc
|
68529ce18a
|
取消关注
|
4 years ago |
|
jianjun
|
567479cb6f
|
导出核酸检测
|
4 years ago |
sunyuchao
|
dcdf02e6b0
|
【核酸】核酸检测
|
4 years ago |
|
sunyuchao
|
cdb8ec7e28
|
【核酸】核酸检测下载模板
|
4 years ago |
|
zxc
|
d8666c408f
|
add
|
4 years ago |
|
sunyuchao
|
7d8c0ed7ca
|
【核酸】核酸检测
|
4 years ago |
zhaoqifeng
|
1bdfbf6acd
|
防疫通知
|
4 years ago |
|
sunyuchao
|
d299af5789
|
【核酸】核酸检测
|
4 years ago |
|
sunyuchao
|
4740324be7
|
【核酸】核酸检测
|
4 years ago |
|
jianjun
|
00591cd10e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e03de9c6d8
|
线程池不够用问题
|
4 years ago |
|
zhaoqifeng
|
e831d56eb0
|
防疫通知
|
4 years ago |
|
jianjun
|
ba6d4d4d29
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2dd4f1b220
|
id生成重复问题
|
4 years ago |
|
zxc
|
53d395c46e
|
list
|
4 years ago |
|
sunyuchao
|
3306ec74ea
|
【核酸】核酸检测
|
4 years ago |
|
jianjun
|
6625dd2adf
|
测试下
|
4 years ago |
|
sunyuchao
|
bbfee55ff9
|
【核酸】核酸检测信息列表
|
4 years ago |
|
zxc
|
c16a7e9080
|
先把框框提上
|
4 years ago |
|
sunyuchao
|
24107913b3
|
核酸记录-表字段表述修改
|
4 years ago |
|
jianjun
|
77c7703c2e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
09d19f519b
|
stats 配置driud连接池 修改
|
4 years ago |
|
sunyuchao
|
f97b4cb903
|
核酸记录-表字段新增pids
|
4 years ago |
|
sunyuchao
|
0a87bfd7ae
|
核酸记录-居民端我的上报
|
4 years ago |
|
jianjun
|
238ffa6181
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
26e7db0ca0
|
stats 配置driud连接池
|
4 years ago |
|
zxc
|
dcbe869c63
|
emm
|
4 years ago |
|
sunyuchao
|
cf001aab6b
|
..
|
4 years ago |
|
sunyuchao
|
07c628b97f
|
核酸记录_新增
|
4 years ago |
|
sunyuchao
|
0b6eef93dc
|
核酸记录代码生成
|
4 years ago |
|
jianjun
|
d5ea391a19
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ce0eb794e2
|
超时打印日志
|
4 years ago |
|
jianjun
|
d3de5f684c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
33661f258e
|
id 重复 试下
|
4 years ago |
|
jianjun
|
118c930d89
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
7e41369e96
|
消费巡查消息调整
|
4 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
4 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
4 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
4 years ago |
|
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
yinzuomei
|
308c9715eb
|
init
|
4 years ago |
|
jianjun
|
403777271d
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
4 years ago |
|
jianjun
|
583868b14d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
4 years ago |
