wxz
|
3b07723a55
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
fee3523582
|
版本升级
|
5 years ago |
wangchao
|
69da1bedee
|
Merge remote-tracking branch 'origin/release'
|
5 years ago |
|
wangchao
|
11a4d6b345
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
wangchao
|
37e731a9f6
|
user ext dev服务升级
|
5 years ago |
|
wangchao
|
03d414f733
|
Merge remote-tracking branch 'origin/dev_plugins' into dev
|
5 years ago |
|
wangchao
|
c83d5c7d0a
|
对外接口，查询机关、部门、网格下工作人员，范围从“不包括未激活和被禁用的”调整成“不包括被禁用的”
|
5 years ago |
zxc
|
31a7f370f1
|
Merge remote-tracking branch 'origin/release'
|
5 years ago |
|
zxc
|
0fb2a60957
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
zxc
|
6f2cb95f27
|
third服务升级
|
5 years ago |
|
zxc
|
42879bcb37
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
dabb4e18d0
|
按钮授权 变更 扫码授权
|
5 years ago |
|
zxc
|
5f54b48ae3
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
b02d471c1a
|
扫码授权 变更 按钮授权
|
5 years ago |
|
zxc
|
f92c76c75b
|
Merge remote-tracking branch 'origin/release'
|
5 years ago |
|
zxc
|
bde1375f42
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
zxc
|
43f0785899
|
third服务升级
|
5 years ago |
|
zxc
|
ff8cff2a05
|
third服务升级
|
5 years ago |
|
zxc
|
06682f021f
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
b0261bca0a
|
扫码授权 变更 按钮授权
|
5 years ago |
sunyuchao
|
35181e100a
|
Merge branch 'release'
|
5 years ago |
|
sunyuchao
|
4795da9517
|
Merge branch 'dev' into release
|
5 years ago |
|
sunyuchao
|
bef22d7102
|
服务升级-遗漏上生产服务
|
5 years ago |
zhaoqifeng
|
44c7aa5168
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
08ee8d7e5e
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
d2f08bb779
|
加急审核修改
|
5 years ago |
|
wxz
|
814a9fd3e6
|
增加docker restart选项
|
5 years ago |
|
wxz
|
25b10d75c4
|
Merge branch 'release'
|
5 years ago |
|
wxz
|
79d491bf29
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
fd3f34f359
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
4136814cab
|
版本升级
|
5 years ago |
|
zhaoqifeng
|
a3b2dfdd32
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
b683eacc87
|
Merge branch 'release'
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
|
5 years ago |
|
zhaoqifeng
|
4a0beb7030
|
Merge branch 'dev' into release
|
5 years ago |
|
zhaoqifeng
|
f7be4ec65b
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
c6fc59e147
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
cac92dc422
|
业务域名服务器域名设置
|
5 years ago |
|
zhaoqifeng
|
5d14c31e96
|
Merge branch 'dev' into release
|
5 years ago |
|
zhaoqifeng
|
0f6a9bd7eb
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
6e524f6ac5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
34799c9c89
|
业务域名服务器域名设置
|
5 years ago |
|
wxz
|
d9bf4e6f9c
|
Merge branch 'release'
# Conflicts:
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
|
5 years ago |
|
wxz
|
1c9c3c9a99
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
65f4fc7c14
|
版本升级
|
5 years ago |
|
sunyuchao
|
d3dc641866
|
Merge branch 'release'
|
5 years ago |
|
sunyuchao
|
314176cf81
|
Merge branch 'dev' into release
|
5 years ago |
|
sunyuchao
|
2119a0847a
|
Merge branch 'dev_staff_transfer' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
|
5 years ago |
|
sunyuchao
|
bfe24cc228
|
Merge branch 'dev_plugins' into dev
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
5 years ago |
|
wxz
|
4a6f8bbfd7
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
|
wxz
|
d65cc6cea2
|
新增：外部应用秘钥重置
|
5 years ago |
