yinzuomei
|
3137db857c
|
Merge remote-tracking branch 'origin/dev_category_project_20210521' into dev_temp
|
4 years ago |
|
yinzuomei
|
2d4a0887c5
|
xxx替换
|
4 years ago |
zxc
|
cb9b6e2fa2
|
统计库 话题主表添加新字段
|
4 years ago |
|
zxc
|
3d9f846d76
|
备注补齐
|
4 years ago |
|
zxc
|
3ab0aeae4a
|
项目分类标签统计修改
|
4 years ago |
|
zxc
|
9d28dbf039
|
备注
|
4 years ago |
|
zxc
|
55f3fb8438
|
分类标签微调
|
4 years ago |
|
yinzuomei
|
b81cc8fa2b
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
456c9376bb
|
热心居民审核报错fix
|
4 years ago |
|
yinzuomei
|
ab30139cbb
|
热心居民审核报错fix
|
4 years ago |
|
yinzuomei
|
346bc1234c
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
yinzuomei
|
f9b7e14c4a
|
添加组织，修改组织，同一个pid，不允许重名. 2
|
4 years ago |
|
zxc
|
1e145af34c
|
分类标签统计修改
|
4 years ago |
|
zxc
|
9658936369
|
分类标签统计删除修改
|
4 years ago |
|
yinzuomei
|
ada60d040f
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
bce5879b5a
|
群成员列表修改
|
4 years ago |
|
yinzuomei
|
ef37c82141
|
群成员列表修改
|
4 years ago |
jianjun
|
665653d89a
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
3ffbd3b55e
|
返回指标说明
|
4 years ago |
|
jianjun
|
de474cc29b
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
4e9ff4fe5f
|
orglevel枚举类型
|
4 years ago |
|
zxc
|
346cf402bb
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
328cccaa29
|
群众不满微调
|
4 years ago |
|
zxc
|
8e248c7cc4
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
76e989c0bf
|
全区服务指数
|
4 years ago |
|
jianjun
|
c065da7cfb
|
密码修改
|
4 years ago |
|
jianjun
|
c2ca0073a7
|
指标字典项-说明
|
4 years ago |
|
yinzuomei
|
2c9e1ff7c6
|
Merge remote-tracking branch 'origin/dev_0519yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
ab5f93a47a
|
添加组织，修改组织，同一个pid不允许重名
|
4 years ago |
|
jianjun
|
61e0c6780b
|
得分说明-代码暂存
|
4 years ago |
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 |
