wangchao
|
b02e92f041
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
wangchao
|
43b9772fd9
|
标签查询时的补偿机制修改
|
4 years ago |
zxc
|
291c469c7b
|
项目分类统计
|
4 years ago |
|
wangchao
|
cc401bb45f
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
wangchao
|
abedb8acff
|
标签查询时的补偿机制修改
|
4 years ago |
|
wangchao
|
f00eccabbe
|
难点赌点修改
|
4 years ago |
|
zxc
|
70d8669fdf
|
项目分类统计
|
4 years ago |
yinzuomei
|
05d5fa1174
|
添加数据对接txt
|
4 years ago |
wxz
|
f763bffcc0
|
Merge branch 'dev_thirdplatform' into dev_temp
|
4 years ago |
|
wxz
|
fb61e356cf
|
修改：
1.项目申请协助接口，调用第三方平台增加notifyUrl
|
4 years ago |
|
wxz
|
d4f1c39f98
|
Merge branch 'dev_thirdplatform' into dev_temp
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
wxz
|
45efc71247
|
修改：
1.内部认证当中放开第三方平台回调地址
|
4 years ago |
jianjun
|
99f84bc255
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
6f983888f3
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
b107907a67
|
resi-group 获取注册用户信息从缓存中获取
|
4 years ago |
zhangyongzhangyong
|
749557d837
|
Merge branch 'dev-customerfunction' into dev_temp
|
4 years ago |
|
zhangyongzhangyong
|
2d761725a9
|
PC端 每个客户的菜单信息，不放入缓存，每次登陆重新查询。
|
4 years ago |
sunyuchao
|
e56f7f34fd
|
Merge branch 'dev_issue_category' into dev_temp
|
4 years ago |
|
sunyuchao
|
93a928b793
|
客户默认分类、标签初始化问题不放在新客户创建过程中 嵌入具体的业务逻辑中，降低新客户初始化程序压力
|
4 years ago |
|
zhangyongzhangyong
|
9f8e27e61b
|
注释维护
|
4 years ago |
|
jianjun
|
be268c6c94
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_318_wangc' into dev_temp
|
4 years ago |
|
jianjun
|
05a567258e
|
难点堵点添加注释
|
4 years ago |
|
jianjun
|
cb955086ed
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_318_wangc
|
4 years ago |
|
sunyuchao
|
c388143463
|
Merge branch 'dev-customerfunction' into dev_temp
|
4 years ago |
|
sunyuchao
|
fd9df10333
|
Merge remote-tracking branch 'origin/dev-customerfunction' into dev-customerfunction
|
4 years ago |
|
sunyuchao
|
9fdb382b74
|
pc运营端token添加客户Id
|
4 years ago |
|
wxz
|
24cbcb3f95
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
4 years ago |
|
wxz
|
686d42b4cd
|
修改：
1.第三方平台接入，AccessToken缓存动作从具体的子类提取到了ApiService中，子类只需要调用ApiService提供的addAccessTokenToCache()/getAccessTokenFromCache()方法即可
|
4 years ago |
zhaoqifeng
|
15e2b8d896
|
Merge branch 'dev_thirdplatform' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
e1dfc04a5c
|
项目发送到第三方平台 detail
|
4 years ago |
|
wxz
|
ed2e3ff8e2
|
修改：ApiService基类中的一些方法的异常文案
修改：放开了调用网格化平台的代码，开始正式调用
调通了对网格化平台的事件上报
|
4 years ago |
|
wangchao
|
63e480b6ef
|
Merge branch 'dev_bugfix_0324_difficulty' into dev_temp
|
4 years ago |
|
wangchao
|
2a6bf3cf8e
|
难点赌点不用单独更新dataEndTime
|
4 years ago |
|
wangchao
|
c1652c3704
|
Merge branch 'dev_bugfix_0324_difficulty' into dev_temp
|
4 years ago |
|
wangchao
|
12a5d22435
|
筛选符合难点赌点的项目sql修改
|
4 years ago |
|
wangchao
|
88ac6d948f
|
项目引用标签更新时的计算修改
|
4 years ago |
|
sunyuchao
|
2986a786a5
|
Merge branch 'dev_issue_category' into dev_temp
|
4 years ago |
|
jianjun
|
84f01bd7c6
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
1832b8982e
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
4 years ago |
|
jianjun
|
5905f69f4a
|
不从缓存取 了因为麻烦 不见得效率高
|
4 years ago |
|
sunyuchao
|
58a6d5c5b6
|
议题分类表添加字段 sql调整
|
4 years ago |
|
sunyuchao
|
4808c5fd10
|
Merge branch 'dev_issue_category' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
|
4 years ago |
|
sunyuchao
|
8aea84d02d
|
解决议题转项目bug问题
|
4 years ago |
|
jianjun
|
a1fb34627a
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
ebd8b16c9c
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
23c3c414c4
|
因为数据库不一致导致的bug
|
4 years ago |
|
wangchao
|
17d4db86d5
|
①修改默认标签的排序方法
②修改搜索标签时查询为null时的补偿方法
③新增批量修改二级分类下的标签在缓存中的"是否禁用"属性
|
4 years ago |
|
jianjun
|
348d9459ab
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
4 years ago |
|
jianjun
|
ca2ef72f15
|
垃圾代码清理-注释的代码已经挪到其他方法里，无需在这放着了
|
4 years ago |
|
jianjun
|
5604868acf
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
