zhaoqifeng
|
e275b61f00
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
9369314986
|
居民端头像从user_base_info获取
|
5 years ago |
yinzuomei
|
d2904296e5
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
133db38da4
|
selectListByIssueApplicationId sql修改
|
5 years ago |
liushaowen
|
1c03d910ff
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
liushaowen
|
51738f72db
|
建议bug修复
|
5 years ago |
|
yinzuomei
|
c38dc8b867
|
工作端议题审核，待审核+已驳回接口拆分为2个。v2
|
5 years ago |
zxc
|
1431da6a68
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
675cf6bd92
|
徽章修改
|
5 years ago |
jianjun
|
6a8c6e4cb8
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
yinzuomei
|
c899840b0a
|
工作端议题审核，待审核+已驳回接口拆分为2个。
|
5 years ago |
|
jianjun
|
39c86ad1f2
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
jianjun
|
4489d35f94
|
徽章添加 初始化脚本
|
5 years ago |
|
zhaoqifeng
|
e0fc623acd
|
居民端头像从user_base_info获取
|
5 years ago |
|
zxc
|
5d41c5c503
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zxc
|
ae1bf616ec
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
yinzuomei
|
10cd3d674a
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zxc
|
be4c32f755
|
徽章修改
|
5 years ago |
|
yinzuomei
|
fa8755909a
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
yinzuomei
|
e23fc068d8
|
修改resi/hall/issue/detail方法，新增返参attitude
|
5 years ago |
|
zxc
|
61022be3e9
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
96d4a01c80
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
f7dd854487
|
运营端-客户高级配置
|
5 years ago |
|
zxc
|
50ded670bb
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
473342fd54
|
徽章修改
|
5 years ago |
|
jianjun
|
d108faaf98
|
徽章添加 排序
|
5 years ago |
|
jianjun
|
69e9bffe47
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
jianjun
|
c089cb9379
|
"党员认证通过后参数校验"
|
5 years ago |
|
yinzuomei
|
e32356b1e2
|
Merge remote-tracking branch 'origin/dev_group_code' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
|
5 years ago |
|
yinzuomei
|
fa98880154
|
修改/resi/group/member/getapplyingmember接口，新增返参enterGroupType
|
5 years ago |
|
zhaoqifeng
|
23cd7d3873
|
徽章审核通过消息
|
5 years ago |
|
yinzuomei
|
f3d5414eb4
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
e3366b92e5
|
@NotNull
|
5 years ago |
|
yinzuomei
|
eda995bb98
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
6ec49d6b1c
|
@NotNull
|
5 years ago |
|
yinzuomei
|
dd053cadb3
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
2c1630f065
|
添加默认构造方法
|
5 years ago |
|
yinzuomei
|
8cc90fc404
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.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
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
zxc
|
ec4e77feb6
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
zxc
|
504dc19e81
|
调用feign接口修改
|
5 years ago |
|
zhaoqifeng
|
461753e5dc
|
运营端-客户高级配置
|
5 years ago |
|
yinzuomei
|
948924fecb
|
议题审核：工作端列表，审核历史 v2
|
5 years ago |
|
yinzuomei
|
ccc0c6259c
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java
|
5 years ago |
|
yinzuomei
|
8945db5962
|
议题审核：工作端列表，审核历史
|
5 years ago |
|
zxc
|
7bcce857e6
|
详情
|
5 years ago |
|
zxc
|
0f9f30a0ad
|
详情
|
5 years ago |
|
yinzuomei
|
1499ae5973
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
yinzuomei
|
776682b699
|
居民端：话题转议题申请详情- 审核历史查询
|
5 years ago |
|
zxc
|
5dcbe85c74
|
详情
|
5 years ago |
|
zxc
|
4e029a3c4f
|
详情
|
5 years ago |
