yinzuomei
|
791e551ada
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
yinzuomei
|
798de2a7ef
|
支部管理v3:党支部列表添加总人数返参
|
5 years ago |
wxz
|
a52a0e2c2e
|
1.删除无用demo
|
5 years ago |
|
yinzuomei
|
4830ae9ead
|
Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch
|
5 years ago |
jianjun
|
a21b3e371f
|
版本号+1
|
5 years ago |
|
yinzuomei
|
c80371d18a
|
支部管理v3:添加功能权限
|
5 years ago |
|
jianjun
|
5fc0fd56ac
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
3b07a345b3
|
版本号+1
|
5 years ago |
|
jianjun
|
034b47ca2c
|
Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
jianjun
|
2a71e82a0f
|
校验问题
|
5 years ago |
|
jianjun
|
8b399ebf69
|
版本号+1
|
5 years ago |
|
jianjun
|
05ace56f1f
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
3c42e33b8b
|
版本号+1
|
5 years ago |
|
jianjun
|
ce7b1862c5
|
Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
|
5 years ago |
|
jianjun
|
b0befb6132
|
校验问题
|
5 years ago |
|
yinzuomei
|
d679bfda3a
|
支部管理v3
|
5 years ago |
|
jianjun
|
3c88c74fb9
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
a26439ff2e
|
Merge branch 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
|
5 years ago |
|
jianjun
|
2b96aee67c
|
党建声音服务部署 解决审核返回结果异常问题
|
5 years ago |
|
jianjun
|
0e02f8bac6
|
版本号+1
|
5 years ago |
|
jianjun
|
f4a7ef58b4
|
Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
|
5 years ago |
|
jianjun
|
2452395e4a
|
图片检测异常是处理
|
5 years ago |
|
wxz
|
93fafc0b10
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
8796f34f80
|
1.新增年维度和季维度
|
5 years ago |
|
jianjun
|
a849e7128b
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jianjun
|
7d8befb142
|
修复错误代码
|
5 years ago |
sunyuchao
|
788558934b
|
数据-项目-机关日、月统计
|
5 years ago |
|
jianjun
|
a1fd29d2c4
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jianjun
|
9d0fdef91b
|
按日部门统计
|
5 years ago |
|
jianjun
|
090bf3fed3
|
按日部门统计
|
5 years ago |
zhaoqifeng
|
d1c1cf8259
|
机关议题日统计
|
5 years ago |
|
sunyuchao
|
c5d0299961
|
数据-项目-机关日、月统计-部分代码提交
|
5 years ago |
|
sunyuchao
|
93faf6d43e
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
sunyuchao
|
c6489e4d08
|
数据-项目-机关月统计-部分代码提交
|
5 years ago |
|
wxz
|
59a9694d5f
|
1.解决冲突
|
5 years ago |
|
wxz
|
9527951fe6
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
|
5 years ago |
|
wxz
|
ec4d5f11af
|
1.新增按季度维度生成
|
5 years ago |
|
jianjun
|
2aa5532b36
|
按日统计文章总数
|
5 years ago |
|
jianjun
|
dbbcda5fd1
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
|
5 years ago |
|
jianjun
|
db753a8c01
|
添加日志及修改sql错误
|
5 years ago |
wangchao
|
1d57419d0f
|
Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/pom.xml
|
5 years ago |
|
wangchao
|
e44bc02046
|
机关维度
|
5 years ago |
|
jianjun
|
0247505e40
|
添加获取周Id的方法
|
5 years ago |
|
yinzuomei
|
db1196ebd0
|
支部管理联调1
|
5 years ago |
|
yinzuomei
|
d69f0fb6d8
|
Merge remote-tracking branch 'origin/dev_partybranch' into dev
|
5 years ago |
|
yinzuomei
|
9346840da4
|
Merge branches 'dev', 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
yinzuomei
|
f31d561956
|
支部管理v2bug修改
|
5 years ago |
|
wxz
|
6360142fee
|
Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
|
5 years ago |
|
wxz
|
71bb0961c3
|
1.新增维度ID生成工具类
|
5 years ago |
|
jianjun
|
65629d13ca
|
分页获取客户id方法
|
5 years ago |
