zhaoqifeng
|
f24b78e3e0
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
81c5c07753
|
党员先锋数据展示接口
|
4 years ago |
zxc
|
dcc362dcd4
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
0a266bec42
|
群众不满微调
|
4 years ago |
wxz
|
16128b1867
|
Merge branch 'dev_party_group_discuss' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
4 years ago |
|
wxz
|
683a83b393
|
去除错误的FeignCLient提交
|
4 years ago |
yinzuomei
|
f113a853e2
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
jianjun
|
e141a7e43f
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
4 years ago |
|
jianjun
|
b10ac25b59
|
得分说明 网格分数完毕
|
4 years ago |
|
wxz
|
213c55d45f
|
Merge branch 'dev_party_group_discuss' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
wxz
|
4142db6120
|
Merge remote-tracking branch 'origin/dev' into dev_party_group_discuss
|
4 years ago |
|
wxz
|
b5b863df2f
|
修改：党群议事->议题列表，增加"针对话题"的话题内容返回
|
4 years ago |
|
yinzuomei
|
74b8bfb559
|
活动签到列表按签到时间降序。
|
4 years ago |
|
jianjun
|
fda6a83255
|
得分说明 添加表格说明
|
4 years ago |
|
jianjun
|
01c986d215
|
组织月度得分添加 原始得分
|
4 years ago |
|
jianjun
|
8b8ae4b7b9
|
网格得分说明暂存-代码调整
|
4 years ago |
|
jianjun
|
aa89523b1f
|
网格得分说明暂存
|
4 years ago |
|
yinzuomei
|
808c41557a
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
yinzuomei
|
850ae0faa8
|
小组活动按天统计bug修改
|
4 years ago |
|
yinzuomei
|
400eade4da
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
yinzuomei
|
3dba5488f9
|
支部建设接口v3
|
4 years ago |
|
yinzuomei
|
dc7c29270d
|
支部建设接口v3
|
4 years ago |
|
yinzuomei
|
535837686c
|
支部建设接口v3
|
4 years ago |
|
yinzuomei
|
112c6efef4
|
项目评价bug发布
|
4 years ago |
|
yinzuomei
|
85b743fbbb
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev
|
4 years ago |
|
yinzuomei
|
6b738356f2
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
yinzuomei
|
018dc14a9d
|
支部建设接口v2
|
4 years ago |
|
yinzuomei
|
3ada3d5f8f
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
|
4 years ago |
|
yinzuomei
|
28da367a68
|
支部建设接口v1
|
4 years ago |
|
zhaoqifeng
|
b83ccffb6e
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
e8cfbdfbd7
|
党员先锋数据展示接口
|
4 years ago |
|
zhaoqifeng
|
74b7fa0db5
|
党员先锋数据展示接口
|
4 years ago |
sunyuchao
|
a6c4a7663a
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
sunyuchao
|
58d0511184
|
转议题话题不允许屏蔽或关闭
|
4 years ago |
|
sunyuchao
|
f841ef8944
|
分支错误 代码回滚
|
4 years ago |
|
sunyuchao
|
405163ae6c
|
已转议题话题不允许再关闭或屏蔽
|
4 years ago |
|
sunyuchao
|
f9845dec57
|
Merge branch 'dev_third_data' 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/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
# epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
sunyuchao
|
d8847b1a6d
|
网格层级五项基础数据查看
|
4 years ago |
|
zxc
|
b6cb2fc5b5
|
群众不满
|
4 years ago |
|
sunyuchao
|
a54d1ce689
|
基础数据-涉及话题数据计算的重新调整查询规则
|
4 years ago |
|
sunyuchao
|
34cd6ed88b
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
sunyuchao
|
417f410564
|
小组总数、热议话题统计sql脚本
|
4 years ago |
|
sunyuchao
|
fc7b3763d0
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
sunyuchao
|
fc195cdf79
|
热议中话题网格、机关日统计程序
|
4 years ago |
|
zhaoqifeng
|
949abb557e
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
abc72c6be9
|
小组成员添加是否党员身份
|
4 years ago |
|
zxc
|
d298a8ea23
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
|
4 years ago |
|
zxc
|
e4ac157a74
|
emm bug
|
4 years ago |
|
zxc
|
704d040d20
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
|
4 years ago |
|
zxc
|
2c776eb409
|
不全项目评价统计修改
|
4 years ago |
