jianjun
|
61f28b9008
|
使用group_concat 必须加group by 否则默认按照 concat字段分组
|
4 years ago |
|
jianjun
|
33aa29a214
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
de9683656a
|
Merge remote-tracking branch 'remotes/origin/dev_article_fix' into develop
|
4 years ago |
|
jianjun
|
72497851b4
|
查询最新文章列表 添加参数 包含和不包含的标签
|
4 years ago |
yinzuomei
|
06bfb471eb
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
yinzuomei
|
2949eadb68
|
/data/report/screen/agency/agencydetail-multic bug
|
4 years ago |
zxc
|
55fa3b074a
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
yinzuomei
|
6be624d80d
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
|
4 years ago |
|
yinzuomei
|
482379082f
|
/data/report/screen/agency/agencydetail-multic
|
4 years ago |
|
zxc
|
2568672b5a
|
Merge remote-tracking branch 'origin/dev_bug_score' into develop
|
4 years ago |
|
zxc
|
219af7102a
|
全区级别修改
|
4 years ago |
|
yinzuomei
|
a166d5b389
|
群众不满和难点赌点列表增加入参areaCode，前端从/data/report/screen/agency/agencydetail这取值
|
4 years ago |
wxz
|
ad2f5bf88d
|
修复：sample_count为null的问题
|
4 years ago |
|
yinzuomei
|
d2b8e873fd
|
群众不满列表v2
|
4 years ago |
|
yinzuomei
|
770fc86699
|
群众不满列表v2
|
4 years ago |
|
zxc
|
7235aee9ad
|
Merge remote-tracking branch 'origin/dev_bug_score' into develop
|
4 years ago |
|
zxc
|
6517583486
|
街道分数计算修改 值，全区计算平均分加客户限制
|
4 years ago |
zhaoqifeng
|
8b91fdee1f
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
9edcd2e361
|
小组等级更新bug修改
|
4 years ago |
|
zhaoqifeng
|
f973596151
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
6c222ff7b3
|
小组等级更新bug修改
|
4 years ago |
|
zhaoqifeng
|
e34e30e1b4
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
08ee589f3a
|
小组等级更新bug修改
|
4 years ago |
|
zhaoqifeng
|
ce51bb6164
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
886c5c2cf1
|
小组等级更新bug修改
|
4 years ago |
|
zhaoqifeng
|
b020c179f5
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
b15b073254
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
67dab3d61e
|
小组等级更新bug修改
|
4 years ago |
|
jianjun
|
b6fed86909
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
e410b2fdad
|
查询公众号注册的客户信息列表 去掉token
|
4 years ago |
|
zhaoqifeng
|
de339c24d2
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
46445eb6ab
|
小组等级更新bug修改
|
4 years ago |
|
zxc
|
d6c2cf55fe
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
sunyuchao
|
daf257506c
|
基础数据上报 部分接口
|
4 years ago |
|
zxc
|
ebfef35c6e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_fusion
Conflicts:
epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
yinzuomei
|
de69be0ede
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
jianjun
|
5d7054c65d
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
|
4 years ago |
|
jianjun
|
c289d02970
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
0679a24421
|
添加日志 用户未登录异常
|
4 years ago |
|
yinzuomei
|
b25781f844
|
/gov/mine/agency/getlatestcustomer返参增加haveSubCustomer、subCustomerIds
|
4 years ago |
|
yinzuomei
|
4baf1408f6
|
SATISFACTION_SCORE修改
|
4 years ago |
|
jianjun
|
0f4bc88ca3
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into develop
|
4 years ago |
|
jianjun
|
d203cfea9e
|
大屏网格员列表返回手机号（org，user，report）代码微调
|
4 years ago |
|
yinzuomei
|
6a79f698ce
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
yinzuomei
|
ff85e01f2e
|
难点赌点列表：difficultyrank-multic
|
4 years ago |
|
sunyuchao
|
ead5b4ea62
|
Merge branch 'dev_oper_role' into dev
|
4 years ago |
|
sunyuchao
|
498c9dd692
|
14个基础数据上报接口模板
|
4 years ago |
|
jianjun
|
f39ccc2a3f
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into develop
|
4 years ago |
|
jianjun
|
dfa7c80111
|
大屏网格员列表返回手机号（org，user，report）
|
4 years ago |
|
zxc
|
827ce44c3d
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
