wangxianzhang
|
38637f0b03
|
生产环境compose文件，替换为version_placeholder
|
4 years ago |
|
wangxianzhang
|
1e004010f7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
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 |
|
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 |
|
wangxianzhang
|
8f1e4721ea
|
生产环境compose文件，替换为version_placeholder
|
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
|
c7edec6fb2
|
工作日任务调整
|
4 years ago |
|
jianjun
|
10e72cc10c
|
Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master
|
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 |
|
jianjun
|
65b05bd569
|
Revert "添加个条件"
This reverts commit 58fc9808
|
4 years ago |
|
jianjun
|
24e5a0fcc9
|
脚本错误
|
4 years ago |
|
jianjun
|
deb515d103
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
62fdf26af7
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
4 years ago |
|
jianjun
|
53e2416cec
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
d1d8a9f3b8
|
初始化工作日->废弃服务内部调用的定时 添加脚本
|
4 years ago |
|
jianjun
|
43308f84a2
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
54df561383
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
f74805ea21
|
初始化工作日->废弃服务内部调用的定时 方法改为post
|
4 years ago |
|
jianjun
|
cd9b26f80e
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
1bba4f6149
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
e7f3872c7d
|
初始化工作日->废弃服务内部调用的定时
|
4 years ago |
|
zhaoqifeng
|
c0867d6e40
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
e324e45a86
|
Merge branch 'dev_epidemic_situation' into develop
|
4 years ago |
|
zhaoqifeng
|
5f9c9d8009
|
批量发送通知bug修改
|
4 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
|
4 years ago |
|
jianjun
|
99919895be
|
bug
|
4 years ago |
|
jianjun
|
8d89aef645
|
主键冲突 服务发布
|
4 years ago |
|
jianjun
|
cd15a10e72
|
Revert "主键冲突 服务发布"
This reverts commit 7b8e3907
|
4 years ago |
|
jianjun
|
7b8e3907c9
|
主键冲突 服务发布
|
4 years ago |
|
jianjun
|
059d54207f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
e31b409225
|
删除测试类
|
4 years ago |
|
jianjun
|
cfd63497f0
|
获取header报错导致业务失败
|
4 years ago |
|
jianjun
|
a1919d5353
|
Merge remote-tracking branch 'remotes/origin/dev' into pingyin_master
|
4 years ago |
yinzuomei
|
473883d01c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
