jianjun
|
59cc5e50ae
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into 主线测试
|
3 years ago |
|
jianjun
|
1d1e5c2fd0
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into develop
|
3 years ago |
|
jianjun
|
7c762cc117
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_epidemic_situation
|
3 years ago |
|
jianjun
|
7e935366b0
|
去掉无用发发
|
3 years ago |
zxc
|
7023e806cc
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
0f640af746
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
a7338f1a5b
|
加了个userId
|
3 years ago |
|
zxc
|
904ad615a3
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
3 years ago |
|
zxc
|
54341f87f9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
yinzuomei
|
bd3e5bae18
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
1896365f69
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
8847f4b3c5
|
加了个组织ID
|
3 years ago |
|
yinzuomei
|
eb32f699fa
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
b25d8924b5
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
yinzuomei
|
4f675e4d0b
|
latestSubmit
|
3 years ago |
|
zxc
|
11c9a0ea79
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
8d1f879415
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
c1e3a2b4bb
|
添加and a.status = 0
|
3 years ago |
|
jianjun
|
1cda4ed61e
|
Merge remote-tracking branch 'origin/release_temp' into 主线测试
|
3 years ago |
|
jianjun
|
14c415ce50
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
e007eea552
|
Merge remote-tracking branch 'remotes/origin/dev' into develop
|
3 years ago |
|
jianjun
|
279829bf45
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
019284cd10
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
a82feb5d7e
|
中间库对接 巡查暂时不同步
|
3 years ago |
|
jianjun
|
9c7969d6a5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
ca9bc011dc
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
7a5ad46370
|
中间库对接 巡查暂时不同步
|
3 years ago |
|
zxc
|
1bbd2fdaeb
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
5a3c1bc25e
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
3beb70dfd8
|
需求变更，取消提示信息
|
3 years ago |
|
yinzuomei
|
c7ed5eebd2
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
5980df3735
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
bc2355b829
|
去掉校验，奇葩需求
|
3 years ago |
|
yinzuomei
|
f17c225310
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
3 years ago |
|
yinzuomei
|
f68a017d6a
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
sunyuchao
|
9dd538a88c
|
Merge branch 'develop' into release_temp
|
3 years ago |
|
yinzuomei
|
5c2ef27da9
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
2806a75bf9
|
bug#2759
|
3 years ago |
|
sunyuchao
|
3a629f9ad4
|
Merge branch 'dev_epidemic_situation' into develop
|
3 years ago |
|
sunyuchao
|
92b670b327
|
需求变更 增加提示文案
|
3 years ago |
wangxianzhang
|
6318b66c2a
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
4259f9299a
|
修复：核酸检测&疫苗接种，建立关系的逻辑
|
3 years ago |
|
wangxianzhang
|
e05ad47cfe
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
8210033cef
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
9121ccc52f
|
解决service同级循环引用问题
|
3 years ago |
|
wangxianzhang
|
591d304ed9
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
3 years ago |
|
wangxianzhang
|
16fed13f6e
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
a0aac7d416
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
wangxianzhang
|
8d489bc0e5
|
entity的customer_id要记得加@TableField注解
|
3 years ago |
zhaoqifeng
|
22b01f2dbb
|
Merge branch 'develop' into release_temp
|
3 years ago |
