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 |
|
wxz
|
1c9c3c9a99
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
65f4fc7c14
|
版本升级
|
5 years ago |
|
zxc
|
b2249ac8fd
|
街道相关优化
|
5 years ago |
sunyuchao
|
d3dc641866
|
Merge branch 'release'
|
5 years ago |
|
sunyuchao
|
314176cf81
|
Merge branch 'dev' into release
|
5 years ago |
|
zxc
|
6a37525f24
|
街道相关
|
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 |
jianjun
|
7abb5bf5bd
|
修改数据库
|
5 years ago |
|
jianjun
|
3266e3d7d3
|
修改数据库
|
5 years ago |
|
jianjun
|
df0c5ae450
|
部署statis
|
5 years ago |
|
jianjun
|
1a40e529a1
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
65995689cf
|
修改数据库
|
5 years ago |
|
jianjun
|
2888963bb0
|
修改数据库
|
5 years ago |
|
jianjun
|
be4cc31ecb
|
修改错误脚本
|
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 |
|
jianjun
|
d7a8b9a40b
|
添加flyway文件
|
5 years ago |
|
jianjun
|
fa0dc92dd5
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
87f7b11197
|
添加flyway文件
|
5 years ago |
wangchao
|
ca5fdf4a26
|
data-report +1 -> 61
|
5 years ago |
|
wangchao
|
b459fb67cd
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zxc
|
c9dabcadaf
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
zxc
|
d31e78978c
|
sql文件
|
5 years ago |
|
wangchao
|
832dcaff6e
|
data-report +1 -> 60
|
5 years ago |
|
wangchao
|
a5dd758ed9
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
874f525436
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
wangchao
|
b62b1aefb3
|
大屏数据接口分页修改
|
5 years ago |
|
jianjun
|
75d227867c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
7456f6a223
|
添加测试及生产数据库配置文件
|
5 years ago |
|
wxz
|
c9c3a224c5
|
版本升级
|
5 years ago |
