wangxianzhang
|
e56451764f
|
修改导入疫苗接种信息-
|
4 years ago |
|
wangxianzhang
|
e2859b7aee
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
4 years ago |
|
wangxianzhang
|
74a4cff982
|
修改导入疫苗接种信息-
|
4 years ago |
jianjun
|
5188122af1
|
疫苗接种 方法提交
|
4 years ago |
|
wangxianzhang
|
68410b2467
|
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/service/impl/IcVaccineServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
e3f264144f
|
修改导入疫苗接种信息-
|
4 years ago |
zxc
|
6ea13aaf40
|
emm
|
4 years ago |
|
zxc
|
db47370fb8
|
emm
|
4 years ago |
|
jianjun
|
74d25bcc89
|
疫苗接种 方法提交
|
4 years ago |
|
zxc
|
0d19ad6fd9
|
emm
|
4 years ago |
|
zxc
|
65b9d84449
|
删除无用
|
4 years ago |
|
zxc
|
51c42f23b9
|
emm
|
4 years ago |
|
jianjun
|
5aeb45a669
|
疫苗接种 方法提交
|
4 years ago |
|
jianjun
|
29f7101356
|
疫苗接种 方法提交
|
4 years ago |
|
jianjun
|
47136ce781
|
疫苗接种 方法提交
|
4 years ago |
|
jianjun
|
d69e26f134
|
疫苗接种 方法提交
|
4 years ago |
|
zxc
|
2e3a26c863
|
代码生成
|
4 years ago |
|
zxc
|
c36267bdb9
|
代码生成
|
4 years ago |
sunyuchao
|
8996a590f9
|
Merge branch 'develop' into release_temp
|
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 |
|
jianjun
|
79dcaf63d7
|
prod.yml修改版本号为占位符
|
4 years ago |
|
jianjun
|
296addb0d0
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
# epmet-auth/deploy/docker-compose-prod.yml
# epmet-gateway/deploy/docker-compose-prod.yml
# epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
# epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
# epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
# epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
# epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
# epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
# epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
# epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
# epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
# epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
# epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
# epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
# epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
# epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
# epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
# epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
|
4 years ago |
|
sunyuchao
|
750ebf0d06
|
居民端我的上报增加返参
|
4 years ago |
|
wangxianzhang
|
56570184d6
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
338f086f49
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
a339bc561f
|
生产环境compose文件，替换为version_placeholder
|
4 years ago |
|
jianjun
|
64877e0f35
|
Revert "Revert "添加个条件""
This reverts commit 65b05bd5
|
4 years ago |
|
jianjun
|
193b6b03c0
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
wangxianzhang
|
8f1e4721ea
|
生产环境compose文件，替换为version_placeholder
|
4 years ago |
|
jianjun
|
57447c8ff4
|
Revert "Revert "添加个条件""
This reverts commit 65b05bd5
|
4 years ago |
|
jianjun
|
4e391a460b
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
32ab3d6f1f
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
5f28334330
|
Revert "Revert "添加个条件""
This reverts commit 65b05bd5
|
4 years ago |
|
zxc
|
7b8eb0a229
|
resi-group
|
4 years ago |
|
zxc
|
c7645fac5d
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
cc0155d913
|
放重复提交注解添加，申请接口和审核接口
|
4 years ago |
|
wangxianzhang
|
0180484d22
|
修改compose文件版本为版本占位符，测试自动版本号
|
4 years ago |
zhaoqifeng
|
6f4d82895e
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
jianjun
|
aed1bc2838
|
工作日任务调整 up
|
4 years ago |
|
zhaoqifeng
|
b0be28ab43
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
zhaoqifeng
|
2b4972e789
|
批量发送通知bug修改
|
4 years ago |
|
jianjun
|
d462586eab
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
zhaoqifeng
|
abb3c17157
|
Merge branch 'develop' into release_temp
|
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
|
12386aeea8
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
9ee1dc2b21
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
