yinzuomei
|
618268ba00
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
yinzuomei
|
3f868ba63b
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
a10bdbfd49
|
test
|
5 years ago |
|
yinzuomei
|
7052b3a901
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
yinzuomei
|
37e2faed36
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
703054cc9e
|
test
|
5 years ago |
|
yinzuomei
|
cfb714da79
|
test
|
5 years ago |
wxz
|
69d1742834
|
Merge branch 'dev_add_customer_id' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java
|
5 years ago |
|
wxz
|
1ca8cc7178
|
issue vote 按日统计接口，增加customerId填充的代码
|
5 years ago |
|
yinzuomei
|
16ad57a0ac
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
yinzuomei
|
8007e8f1b0
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
|
5 years ago |
|
yinzuomei
|
dc9e85afdb
|
事件分析接口路径修改
|
5 years ago |
jianjun
|
91bb14906d
|
Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
jianjun
|
233f53f2c8
|
平阴集成平台-跳转工作端 去掉写死的代码
|
5 years ago |
|
yinzuomei
|
395bc21935
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
dd2758e51a
|
中央区项目分布接口添加status
|
5 years ago |
|
wxz
|
bdd77edaba
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_add_customer_id
|
5 years ago |
|
wxz
|
e94ef82d0d
|
Merge branch 'dev_mq_init_customer' into dev
|
5 years ago |
|
wxz
|
2fc7a3bb9c
|
Merge branches 'dev' and 'dev_add_customer_id' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_add_customer_id
|
5 years ago |
|
wxz
|
d8a4c87625
|
Merge branch 'dev' into dev_add_customer_id
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java
# epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
# epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicDTO.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java
|
5 years ago |
|
yinzuomei
|
98a9e15c8b
|
test
|
5 years ago |
wangchao
|
71b38c0eb0
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
wangchao
|
96af241158
|
代码调整
|
5 years ago |
|
wxz
|
08a66421c6
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
wxz
|
9093c08bb4
|
修改rocketmq的注册方式：springboot注册->手动api注册
|
5 years ago |
|
wangchao
|
d4a954b69b
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
wangchao
|
bf6d0b584f
|
给难点赌点加上demo调用
|
5 years ago |
|
yinzuomei
|
6f1bef31f2
|
selectIssueProjectList方法修改，指定customer_id表名
|
5 years ago |
|
wangchao
|
bb1498614f
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
wangchao
|
0ac8f3b756
|
给mybatis返回的实体类增加无参构造器
|
5 years ago |
|
yinzuomei
|
c9439e3167
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
61eca4df09
|
项目详情接口修改
|
5 years ago |
|
yinzuomei
|
e138c036c6
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
3b03299ef9
|
indexstatistics
|
5 years ago |
|
wangchao
|
c5aecd42c1
|
Merge branch 'dev_bugfix_sync_issue_vote' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
|
5 years ago |
|
wangchao
|
afbc9e0a9d
|
每小时将议题表决数字从缓存同步到db逻辑任务加上事务
|
5 years ago |
|
wangchao
|
a6cb06aae6
|
每小时将议题表决数字从缓存同步到db逻辑修改
|
5 years ago |
|
yinzuomei
|
0d54716db3
|
indexstatistics
|
5 years ago |
zxc
|
861f90cee3
|
指标计算开新方法【可多月一起计算】
|
5 years ago |
|
wxz
|
cd14c21b4b
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
wxz
|
c2d1968e17
|
修改rocketmq的注册方式：springboot注册->手动api注册
|
5 years ago |
|
wxz
|
05ebef4d45
|
Merge branch 'dev' into dev_mq_init_customer
|
5 years ago |
|
yinzuomei
|
7df5f3f59f
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
f84578f3a4
|
议题发表建议，查看建议修改
|
5 years ago |
sunyuchao
|
d21062f169
|
Merge branch 'dev_jcet' into dev_temp
|
5 years ago |
|
sunyuchao
|
1082d4127f
|
h5工作端登陆调整token缓存存储位置
|
5 years ago |
|
yinzuomei
|
4a323725c1
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
dc7a96aca7
|
bug修改2
|
5 years ago |
|
yinzuomei
|
cd5402fdca
|
bug修改
|
5 years ago |
|
jianjun
|
7f11973dc6
|
Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp
|
5 years ago |
