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 |
jianjun
|
b25dfe810e
|
Merge remote-tracking branch 'remotes/origin/dev_externalappauth' into dev_screen_data
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
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 |
wxz
|
6f7dca1ecb
|
版本升级
|
5 years ago |
|
wxz
|
3c3a757fab
|
Merge branch 'dev_footbar' into dev_temp
|
5 years ago |
|
wxz
|
e508de86db
|
增加/修改footbar去掉图标路径必填校验
|
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 |
|
zxc
|
8d0e923f77
|
getAgencyListByCustomerId方法数据源改回原来的 STATS
|
5 years ago |
|
zhaoqifeng
|
d2f08bb779
|
加急审核修改
|
5 years ago |
zhangyongzhangyong
|
f7282c4f00
|
control代码恢复
|
5 years ago |
|
zhangyongzhangyong
|
6847c957e2
|
配置文件恢复
|
5 years ago |
|
zhangyongzhangyong
|
95d8c395cb
|
Merge branch 'dev_screen_data' of C:\Users\Administrator\Desktop\党群e事通后端 with conflicts.
|
5 years ago |
|
jianjun
|
e073922dc1
|
添加统一的应用启动检查类
|
5 years ago |
|
wxz
|
814a9fd3e6
|
增加docker restart选项
|
5 years ago |
|
jianjun
|
e65c6581ed
|
添加统一的应用启动检查类
|
5 years ago |
|
jianjun
|
9fbb8136e4
|
党员相关 如果只有一条记录则给50分；处理导入指标的正负相关及阈值
|
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 |
yinzuomei
|
84de6cfe32
|
stats 57
|
5 years ago |
|
yinzuomei
|
0b88f1e19d
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
1427c2cbbc
|
区直部门暂存v1
|
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 |
|
zxc
|
a203a8626d
|
街道相关优化 3
|
5 years ago |
|
zhaoqifeng
|
6e524f6ac5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
34799c9c89
|
业务域名服务器域名设置
|
5 years ago |
|
zxc
|
1f27decf19
|
街道相关优化 2
|
5 years ago |
|
yinzuomei
|
6b2730e4aa
|
区直部门暂存
|
5 years ago |
|
yinzuomei
|
7a843a47a5
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
2a3bcfde29
|
/data/stats/indexcollect/orggovrnability新增handleProjectRatio
|
5 years ago |
|
zxc
|
e9896edd90
|
街道相关优化 1
|
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 |
