sunyuchao
|
2986a786a5
|
Merge branch 'dev_issue_category' into dev_temp
|
5 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
|
5 years ago |
|
jianjun
|
5905f69f4a
|
不从缓存取 了因为麻烦 不见得效率高
|
5 years ago |
|
sunyuchao
|
58a6d5c5b6
|
议题分类表添加字段 sql调整
|
5 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
|
5 years ago |
|
sunyuchao
|
8aea84d02d
|
解决议题转项目bug问题
|
5 years ago |
|
jianjun
|
a1fb34627a
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
23c3c414c4
|
因为数据库不一致导致的bug
|
5 years ago |
wangchao
|
17d4db86d5
|
①修改默认标签的排序方法
②修改搜索标签时查询为null时的补偿方法
③新增批量修改二级分类下的标签在缓存中的"是否禁用"属性
|
5 years ago |
|
jianjun
|
ca2ef72f15
|
垃圾代码清理-注释的代码已经挪到其他方法里，无需在这放着了
|
5 years ago |
|
jianjun
|
5604868acf
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
3cd831408c
|
替换feign的client端使用okhttp
|
5 years ago |
|
jianjun
|
92df82d855
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
03c1760144
|
替换feign的client端-测试
|
5 years ago |
|
jianjun
|
5522dfbaf4
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
6c44ba2e45
|
Revert "分析下登陆接口 各个阶段耗时"
This reverts commit e0161568
|
5 years ago |
|
jianjun
|
6467aada61
|
Revert "分析下登陆接口 各个阶段耗时"
This reverts commit 32dbd62d
|
5 years ago |
|
wangchao
|
2dcdbd172a
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
a3c55ef3f5
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
abbba792a9
|
接口自测问题修改
|
5 years ago |
|
jianjun
|
b7d9e22f95
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
32dbd62d36
|
分析下登陆接口 各个阶段耗时
|
5 years ago |
|
jianjun
|
5822cdf028
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
e01615689e
|
分析下登陆接口 各个阶段耗时
|
5 years ago |
zhangyongzhangyong
|
cfe0913cb0
|
客户分类列表
|
5 years ago |
|
zhangyongzhangyong
|
87868161ca
|
一级、二级分类新增/修改
|
5 years ago |
yinzuomei
|
72bfff720e
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
25f34e8c97
|
项目分类采集api
|
5 years ago |
|
yinzuomei
|
b6be4490a3
|
Merge remote-tracking branch 'origin/dev_longwan0323' into dev_temp
|
5 years ago |
|
yinzuomei
|
4945189426
|
龙湾项目分布接口默认按照转项目时间降序返回前20
|
5 years ago |
|
wangchao
|
7b4aee8032
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
cb28719d7c
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
3227011268
|
代码逻辑调整
|
5 years ago |
|
sunyuchao
|
cb4d3d7786
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
b129219f27
|
数据库添加字段 sql调整
|
5 years ago |
|
sunyuchao
|
ee9233d87c
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
945d994c15
|
漏提代码
|
5 years ago |
|
sunyuchao
|
81794a99cd
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
c0d3dd990b
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
sunyuchao
|
b3b2e51df8
|
客户初始化分类、标签方法调整
|
5 years ago |
|
yinzuomei
|
f956bbd075
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
7d7975a4ae
|
/data/report/project/categorydict接口调整back
|
5 years ago |
|
yinzuomei
|
dd2dff387b
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
e391ab9b13
|
/data/report/project/categorydict接口调整2
|
5 years ago |
|
yinzuomei
|
8171c7c0df
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
b5f2aab029
|
/data/report/project/categorydict接口调整
|
5 years ago |
|
sunyuchao
|
262d43bf29
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
4fa14db16b
|
解决sql脚本版本冲突问题
|
5 years ago |
|
yinzuomei
|
b207cfc674
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
yinzuomei
|
9a56db476d
|
网格内按分类统计项目数量 start3
|
5 years ago |
