wxz
|
a3ca90a60c
|
Merge branch 'dev_newversion' into dev_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
8d00b1362f
|
修改compose-test.yml的版本，使用时间戳版本
|
5 years ago |
wangchao
|
cea1aa99a1
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
c2cec55b80
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
6972e725b4
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
fb8d664482
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
76c8e5bb82
|
项目节点耗时数据补充 增加第一次响应时效
|
5 years ago |
|
wangchao
|
390761ab0f
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
e8256162e3
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
|
wangchao
|
92e6ee41d4
|
项目节点耗时数据补齐接口
|
5 years ago |
jianjun
|
e0177da038
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
zxc
|
ca48ac6fa5
|
项目详情修改
|
5 years ago |
|
jianjun
|
23b7685102
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
1d81408cf4
|
党支部分布，用户分布，党员分布 调整显示智慧社区要显示的
|
5 years ago |
|
jianjun
|
9f3ee08553
|
添加注释
|
5 years ago |
zhaoqifeng
|
45071ddf18
|
项目超期滞留提醒定时任务
|
5 years ago |
|
jianjun
|
dccc9a8b1b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
1949da956b
|
五级指标原始值 添加权重
|
5 years ago |
|
jianjun
|
436f798caf
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
79cdd1a2b8
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
|
5 years ago |
|
jianjun
|
974622bfdd
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
14ed396fc9
|
删除错误包
|
5 years ago |
|
zhaoqifeng
|
40bc5d0320
|
项目超期滞留提醒定时任务
|
5 years ago |
|
jianjun
|
04bddf2285
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
|
zxc
|
23d4e4a8ca
|
项目详情
|
5 years ago |
|
jianjun
|
f4e4299520
|
删除错误包
|
5 years ago |
|
jianjun
|
bc9a7faa60
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
|
wangchao
|
84bcaf98f7
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
|
5 years ago |
|
wangchao
|
62093f1bc7
|
feign注解
|
5 years ago |
|
jianjun
|
c13fcd5484
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
|
wangchao
|
b74d86536c
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
|
jianjun
|
4bcfff380f
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
5 years ago |
|
jianjun
|
69f3a55a0c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
921c52a10b
|
因为项目业务改造而需要将历史数据补充到新表的逻辑，从data-stats移动到gov-project下
|
5 years ago |
|
zxc
|
759c3ce4b5
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
ed2739ae60
|
项目详情
|
5 years ago |
|
zxc
|
3007f286f1
|
项目详情
|
5 years ago |
|
wxz
|
56dfcf89e7
|
Merge branch 'dev_newversion' into dev_temp
# Conflicts:
# epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
# epmet-auth/deploy/docker-compose-dev.yml
# epmet-gateway/deploy/docker-compose-dev.yml
# epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
# epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
# epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
# epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
# epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
# epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
# epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
# epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
# epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
# epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
# epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
# epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
# epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
# epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
# epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
# epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
# epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
|
5 years ago |
|
wxz
|
752b5fa889
|
开发启用新的版本号
|
5 years ago |
|
wxz
|
4b2f888834
|
Merge branch 'dev_newversion' into dev_temp
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
|
5 years ago |
|
wxz
|
a73eeee6a2
|
oss测试启用新的版本号
|
5 years ago |
|
jianjun
|
19ae3760b7
|
部署report
|
5 years ago |
|
jianjun
|
c3e3e19a94
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
b943131d11
|
本级及下级 乘以权重
|
5 years ago |
|
zxc
|
c09701e7fd
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
a5915b1196
|
项目详情
|
5 years ago |
|
zxc
|
cf983f6696
|
report,project服务升级
|
5 years ago |
|
zxc
|
d95f0ad25c
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
328a76a173
|
项目详情
|
5 years ago |
|
jianjun
|
8e56e56210
|
部署report
|
5 years ago |
