yinzuomei
							
						 | 
						
							
							
							
								
							
								05fe810ed0
								
							
								
							
						 | 
						
							
							
								
								居民端话题详情接口修改,添加屏蔽信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								619e1cbde4
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1a79180b2c
								
							
								
							
						 | 
						
							
							
								
								徽章删除问题修改,徽章列表添加type字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cbb074fb02
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c03523e066
								
							
								
							
						 | 
						
							
							
								
								个人中心-我参与的话题去除已屏蔽的话题,修改selectParticipatedTopics sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								87f4e904b0
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1ab9eecc7a
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5d16a38417
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9369314986
								
							
								
							
						 | 
						
							
							
								
								居民端头像从user_base_info获取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								133db38da4
								
							
								
							
						 | 
						
							
							
								
								selectListByIssueApplicationId sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								51738f72db
								
							
								
							
						 | 
						
							
							
								
								建议bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c38dc8b867
								
							
								
							
						 | 
						
							
							
								
								工作端议题审核,待审核+已驳回接口拆分为2个。v2
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								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
							
						 | 
						
							
							
							
								
							
								96d4a01c80
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f7dd854487
								
							
								
							
						 | 
						
							
							
								
								运营端-客户高级配置
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								fa98880154
								
							
								
							
						 | 
						
							
							
								
								修改/resi/group/member/getapplyingmember接口,新增返参enterGroupType
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								23cd7d3873
								
							
								
							
						 | 
						
							
							
								
								徽章审核通过消息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e3366b92e5
								
							
								
							
						 | 
						
							
							
								
								@NotNull
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6ec49d6b1c
								
							
								
							
						 | 
						
							
							
								
								@NotNull
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2c1630f065
								
							
								
							
						 | 
						
							
							
								
								添加默认构造方法
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a30b34f994
								
							
								
							
						 | 
						
							
							
								
								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-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e559914843
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
#	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-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.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/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 | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								827f1c79df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								db641b2927
								
							
								
							
						 | 
						
							
							
								
								user_advice修改content字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								83ab07aeae
								
							
								
							
						 | 
						
							
							
								
								居民端议题审核相关:待审核||已驳回  申请列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								35bd26f5a2
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4e6d7169ba
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago |