jianjun
|
f1e91767ca
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
ebd8b16c9c
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
|
jianjun
|
23c3c414c4
|
因为数据库不一致导致的bug
|
5 years ago |
|
jianjun
|
9031961d61
|
暂时发布一些服务
|
5 years ago |
|
jianjun
|
a9f03bf883
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj'
|
5 years ago |
|
jianjun
|
348d9459ab
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
|
5 years ago |
|
jianjun
|
ca2ef72f15
|
垃圾代码清理-注释的代码已经挪到其他方法里，无需在这放着了
|
5 years ago |
|
jianjun
|
3cd831408c
|
替换feign的client端使用okhttp
|
5 years ago |
|
jianjun
|
03c1760144
|
替换feign的client端-测试
|
5 years ago |
yinzuomei
|
2ec2b264ca
|
龙湾项目分布接口默认按照转项目时间降序返回前20 fabu
|
5 years ago |
|
yinzuomei
|
76c68fab66
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
4945189426
|
龙湾项目分布接口默认按照转项目时间降序返回前20
|
5 years ago |
|
jianjun
|
a1636d4933
|
加强判断
|
5 years ago |
zhangyongzhangyong
|
c6e4dbcbd5
|
建表语句
|
5 years ago |
|
jianjun
|
2d3231993e
|
查询用户表 返回具体字段
|
5 years ago |
|
jianjun
|
7d6d8c0e86
|
推荐小组-获取组长信息接口优化 如果缓存不在使用原来的方法
|
5 years ago |
|
jianjun
|
cbc4ab149b
|
推荐小组-获取组长信息接口优化 直接从缓存取用户数据
|
5 years ago |
|
jianjun
|
e209a6b90d
|
推荐小组-获取组长信息接口优化 直接从缓存取用户数据
|
5 years ago |
wangchao
|
4c8e9d8061
|
get组员缓存修改
|
5 years ago |
zxc
|
8b0ec734b2
|
添加注释
|
5 years ago |
|
wangchao
|
2ec8958421
|
注释修改
|
5 years ago |
|
zxc
|
a6e8a50744
|
添加注释
|
5 years ago |
|
wangchao
|
efe7e7405f
|
注释修改
|
5 years ago |
|
wangchao
|
7e75a21793
|
注释修改
|
5 years ago |
|
wangchao
|
070c228db3
|
注释修改
|
5 years ago |
|
wangchao
|
db21e72f0e
|
Merge remote-tracking branch 'origin/dev_bugfix_318_wangc' into dev_bugfix_318_wangc
|
5 years ago |
|
wangchao
|
b4d30dc027
|
注释修改
|
5 years ago |
|
jianjun
|
84ed2e0f42
|
Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev
|
5 years ago |
|
zxc
|
8b5d7cf0f9
|
添加注释
|
5 years ago |
|
zhangyongzhangyong
|
683326487f
|
修改客户菜单接口 - 入参
|
5 years ago |
|
wangchao
|
1a86bba4af
|
issue 66 -> 67 prod
|
5 years ago |
|
wangchao
|
52ada98b8d
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
57900ec03f
|
issueVoteStats任务修改
|
5 years ago |
|
jianjun
|
56cd038c34
|
升级auth：配置生产环境 jcet g端
|
5 years ago |
|
yinzuomei
|
a9e22ebdaa
|
按天抽取暂时注释：screenProjectSettleService.extractScreenData +1
|
5 years ago |
|
yinzuomei
|
7857d841c3
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
820e8dc642
|
按天抽取暂时注释：screenProjectSettleService.extractScreenData
|
5 years ago |
|
yinzuomei
|
75b13f1d8f
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
5182ba8f63
|
难点赌点生成项目话题Map时遇到同样的key覆盖上一个
|
5 years ago |
|
yinzuomei
|
494f1e468d
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
zhangyongzhangyong
|
41e26e774a
|
改成post请求
|
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
|
b686e35cdc
|
stat+1:参数校验升级
|
5 years ago |
|
yinzuomei
|
1404c2c913
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
10041622ea
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev
|
5 years ago |
|
zhangyongzhangyong
|
bf3cd3b742
|
客户菜单-自定义
|
5 years ago |
|
wangchao
|
45df6641eb
|
screenProjectData
|
5 years ago |
|
zxc
|
58601542f4
|
user服务升级
|
5 years ago |
