yinzuomei
|
21bd8c8c02
|
Merge branches 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
yinzuomei
|
e3f2867e92
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
yinzuomei
|
8b85794225
|
新增：/data/report/user/checksublist接口
|
5 years ago |
jianjun
|
e4afe22101
|
版本号+1
|
5 years ago |
|
jianjun
|
7defc80549
|
版本号+1
|
5 years ago |
|
jianjun
|
de7436b07a
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
zxc
|
dfc78dea27
|
数据统计修改
|
5 years ago |
|
zxc
|
1c4798d086
|
数据统计修改
|
5 years ago |
jiangyuying
|
1d49966667
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jiangyuying
|
251db3d7a2
|
宣传能力--type修改和下级机关去除self
|
5 years ago |
wangchao
|
1e79e5e8a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wangchao
|
7d44e82efc
|
job服务、数据服务版本号+1
|
5 years ago |
|
wangchao
|
120a03c985
|
Merge branch 'dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
98565f12a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
0f4a434bdd
|
限制钉钉消息发送数量
|
5 years ago |
|
wangchao
|
2a3bb4deab
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
wangchao
|
95de02eb92
|
修改定时任务可以通过页面传参
|
5 years ago |
zhaoqifeng
|
9627303f77
|
议题统计修改
|
5 years ago |
wxz
|
00ec8e0a0e
|
版本升级
|
5 years ago |
|
wxz
|
aeed8f08a5
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
wxz
|
7cae081cb1
|
Merge branch 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
wxz
|
763fddf71d
|
调整日期维度初始化，初始化到任务执行当天
|
5 years ago |
sunyuchao
|
d28a0813be
|
议题、项目服务升级
|
5 years ago |
|
sunyuchao
|
f3e5ae3c0b
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
4686aafc9e
|
因分布式事务问题，议题转项目接口添加数据判断
|
5 years ago |
|
zxc
|
54fb0b27f0
|
数据统计修改
|
5 years ago |
|
wangchao
|
cdc1ac701e
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
|
5 years ago |
|
wangchao
|
93d4bfbe8d
|
用户定时任务调整，热心居民去重
|
5 years ago |
|
jianjun
|
0009ef4b8d
|
版本号+1
|
5 years ago |
|
jianjun
|
1c2daabc59
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
8b861db5bd
|
error日志统一处理
|
5 years ago |
|
jianjun
|
28bbc62285
|
版本号+1
|
5 years ago |
|
jianjun
|
6f0475aaa8
|
Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev
|
5 years ago |
|
jianjun
|
b80ecb5081
|
调整代码
|
5 years ago |
|
jianjun
|
5ba67b9c19
|
调整代码
|
5 years ago |
|
wxz
|
40d3a28be3
|
版本升级
|
5 years ago |
|
wxz
|
f7ab9ed335
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
wxz
|
d5afc43c74
|
修改用户时候，更新角色的缓存信息bug修复
|
5 years ago |
|
yinzuomei
|
3216935822
|
bug修改，统一更新服务
|
5 years ago |
|
yinzuomei
|
a18c76d078
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev
|
5 years ago |
|
yinzuomei
|
6dc956464f
|
Merge branches 'dev_data_stats', 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
yinzuomei
|
5a05a8239e
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
yinzuomei
|
599f9e56c0
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
yinzuomei
|
f948da1746
|
用户汇总信息百分比修改
|
5 years ago |
|
zhaoqifeng
|
c4ab716b9a
|
议题数据查询
|
5 years ago |
|
zxc
|
b1d7fc9713
|
话题百分比
|
5 years ago |
|
jiangyuying
|
2970e3983a
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
jiangyuying
|
65525692be
|
短信--获取短信列表
|
5 years ago |
|
sunyuchao
|
396e45c676
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
sunyuchao
|
d18ec7d003
|
因议题主表DB设计字段key值单词错误引起的代码变动(resloved-resolved)
|
5 years ago |
