sunyuchao
|
5be7fdea0e
|
议题项目分类db调整引起的代码逻辑调整
|
5 years ago |
wxz
|
e62bbd3747
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
wxz
|
92d668a34c
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
c89d5a3a94
|
补充提交
|
5 years ago |
|
wxz
|
f87d6562b2
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wxz
|
7b3c63a2e2
|
增加一次性保存客户-第三方平台-action的接口
|
5 years ago |
zxc
|
8b5d7cf0f9
|
添加注释
|
5 years ago |
|
sunyuchao
|
886c7a54a9
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
59ae4e2384
|
议题、项目分类、标签db调整引起的变化
|
5 years ago |
|
zxc
|
4ef6233786
|
trace/projectDetail api修改
|
5 years ago |
|
zxc
|
05d82052a0
|
trace/projectDetail api修改
|
5 years ago |
zhangyongzhangyong
|
f438a54e73
|
Merge remote-tracking branch 'origin/dev-customerfunction' into dev_temp
|
5 years ago |
wangchao
|
1bf9832258
|
1、大屏项目采集分类显示上级分类用-连接，多个分类用,分割
2、议题转项目V2接口发送积分事件
|
5 years ago |
|
zhangyongzhangyong
|
683326487f
|
修改客户菜单接口 - 入参
|
5 years ago |
|
wxz
|
b13722872e
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
wxz
|
b72fa65f3c
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wxz
|
b51e5da15a
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
wxz
|
40afaa0c5c
|
错误提交了数据库外网地址，修正
|
5 years ago |
|
wxz
|
98319993a1
|
【第三方平台】1.新增客户保存所选平台接口
2.新增客户自定义平台名称等信息接口
|
5 years ago |
|
wxz
|
2fd51cd7be
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wxz
|
42f8873968
|
修改第三方平台对接的设计
|
5 years ago |
|
wangchao
|
341644bc44
|
Merge branch 'dev_bugfix_318_wangc' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
|
5 years ago |
|
zxc
|
48f093e704
|
trace/processList-v2 api修改
|
5 years ago |
|
wangchao
|
57900ec03f
|
issueVoteStats任务修改
|
5 years ago |
|
zxc
|
a66f848d95
|
trace/processList-v2 api修改
|
5 years ago |
|
wxz
|
21c7ee5a0e
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wxz
|
c5fd4f60ad
|
修改第三方平台对接的设计
|
5 years ago |
|
zxc
|
f1be2842b8
|
trace/processList-v2 api修改
|
5 years ago |
|
sunyuchao
|
0db1b4a6c8
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
1d16f90d3e
|
议题项目分类旧程序逻辑调整
|
5 years ago |
jianjun
|
61a775ff75
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
56cd038c34
|
升级auth：配置生产环境 jcet g端
|
5 years ago |
zhaoqifeng
|
2d72f75c8d
|
project_process修改
|
5 years ago |
|
zxc
|
f970eeb74e
|
trace/projectdetail api修改
|
5 years ago |
|
zxc
|
6f9bbcfaa9
|
trace/projectdetail api修改
|
5 years ago |
|
wxz
|
9c1a1d89ef
|
对接三方平台修改
|
5 years ago |
|
zhangyongzhangyong
|
c5489fc336
|
Merge remote-tracking branch 'origin/dev-customerfunction' into dev_temp
|
5 years ago |
|
wxz
|
f3dca7d716
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
4bea3bf5d9
|
Merge branches 'dev' and 'dev_issue_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_category
Conflicts:
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
5 years ago |
|
zhaoqifeng
|
f1fc9d552b
|
特殊客户-居民和热心居民显示名称修改
|
5 years ago |
yinzuomei
|
820e8dc642
|
按天抽取暂时注释：screenProjectSettleService.extractScreenData
|
5 years ago |
|
wangchao
|
a983cbaa8f
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
|
5 years ago |
|
wangchao
|
5182ba8f63
|
难点赌点生成项目话题Map时遇到同样的key覆盖上一个
|
5 years ago |
|
wxz
|
440472f1ec
|
对接三方平台修改
|
5 years ago |
|
zhangyongzhangyong
|
41e26e774a
|
改成post请求
|
5 years ago |
|
yinzuomei
|
a4973694e6
|
Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
|
5 years ago |
|
yinzuomei
|
4a564833ae
|
NumConstant
|
5 years ago |
|
zhangyongzhangyong
|
3a3a1cab73
|
菜单缓存key，由userId 改为 customerId
|
5 years ago |
|
yinzuomei
|
9d0a709127
|
Merge branches 'dev' and 'dev_pyscreenv2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreenv2
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectProcessService.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
|
5 years ago |
|
yinzuomei
|
10041622ea
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
