jianjun
|
59dce792f6
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
01a73d15bf
|
分析sql 去掉spring
|
4 years ago |
|
jianjun
|
6db7096286
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
a1636d4933
|
加强判断
|
4 years ago |
yinzuomei
|
7099a7e69e
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
4 years ago |
|
yinzuomei
|
6581047b40
|
网格内按分类统计项目数量 start1
|
4 years ago |
|
jianjun
|
bc4793ff35
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
37d86f4acf
|
分析sql
|
4 years ago |
|
jianjun
|
413ef2162d
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
6ce3748d6f
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
4 years ago |
zhangyongzhangyong
|
badf75b7e5
|
Merge branch 'dev-customerfunction' into dev_temp
|
4 years ago |
|
zhangyongzhangyong
|
c6e4dbcbd5
|
建表语句
|
4 years ago |
|
jianjun
|
3edbcdeae7
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
ba513891bd
|
分析sql
|
4 years ago |
|
jianjun
|
2d3231993e
|
查询用户表 返回具体字段
|
4 years ago |
wxz
|
e032a11f75
|
Merge branch 'dev_thirdplatform' into dev_temp
# Conflicts:
# epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
# epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
|
4 years ago |
|
wxz
|
f7cc19944d
|
删除：
1.oper_crm中多余的list_by_customer接口
|
4 years ago |
|
yinzuomei
|
483958fa1d
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
# 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
|
5 years ago |
|
yinzuomei
|
5c3f6d28bc
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
# 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
|
5 years ago |
|
yinzuomei
|
ddc38610ba
|
网格内按分类统计项目数量 start
|
5 years ago |
zxc
|
45de6c7e2b
|
逻辑修改
|
5 years ago |
|
zxc
|
0a174b88a7
|
逻辑修改
|
5 years ago |
|
yinzuomei
|
27dcd06da9
|
项目分类信息抽取到指标库level赋值修改
|
5 years ago |
|
jianjun
|
7d6d8c0e86
|
推荐小组-获取组长信息接口优化 如果缓存不在使用原来的方法
|
5 years ago |
liushaowen
|
ef551f3eeb
|
项目分类信息抽取到指标库
|
5 years ago |
|
jianjun
|
efd828f701
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
cbc4ab149b
|
推荐小组-获取组长信息接口优化 直接从缓存取用户数据
|
5 years ago |
|
jianjun
|
0902e1df2a
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
e209a6b90d
|
推荐小组-获取组长信息接口优化 直接从缓存取用户数据
|
5 years ago |
|
yinzuomei
|
6e388b3559
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
yinzuomei
|
8bbbbc2610
|
项目分类统计sql
|
5 years ago |
|
zhangyongzhangyong
|
745a59bb94
|
Merge branch 'dev_issue_category' into dev_temp
# 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/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
# epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
|
5 years ago |
wangchao
|
0477b6cc62
|
Merge remote-tracking branch 'origin/dev_bugfix_318_wangc' into dev_temp
|
5 years ago |
|
wangchao
|
4c8e9d8061
|
get组员缓存修改
|
5 years ago |
|
wangchao
|
acda781ffc
|
Merge remote-tracking branch 'origin/dev_bugfix_318_wangc' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
5788866066
|
项目分类字典上报
|
5 years ago |
zhaoqifeng
|
8fbee8382d
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
0b0470e84e
|
项目发送到第三方平台 sql脚本
|
5 years ago |
|
zhaoqifeng
|
f04ac459e2
|
项目发送到第三方平台 sql脚本
|
5 years ago |
|
zhangyongzhangyong
|
c548c5b4de
|
《002、项目分类字典查询》接口开发
|
5 years ago |
|
yinzuomei
|
d9aa877787
|
增加level
|
5 years ago |
|
wxz
|
75b3edca2e
|
Merge branch 'dev_thirdplatform' into dev_temp
|
5 years ago |
|
wxz
|
7f04bad985
|
修复：
1.客户保存选中的第三方列表为空的时候，不处理的bug
|
5 years ago |
|
jianjun
|
f5ad3b098d
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
|
jianjun
|
d705569718
|
项目 议题 小组 添加数据库监控配置 分析sql step2
|
5 years ago |
|
yinzuomei
|
f449c11466
|
新增fact_origin_project_category_daily
|
5 years ago |
|
zxc
|
8b0ec734b2
|
添加注释
|
5 years ago |
|
wangchao
|
2ec8958421
|
注释修改
|
5 years ago |
|
yinzuomei
|
6702899ec7
|
网格内、组织内项目分类统计项目数量采集API调整， 大屏事件类型分析查询接口调整
|
5 years ago |
|
jianjun
|
a9abd51ae9
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp
|
5 years ago |
