sunyuchao
							
						 | 
						
							
							
							
								
							
								dc99121d67
								
							
								
							
						 | 
						
							
							
								
								注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								1bce7e8d49
								
							
								
							
						 | 
						
							
							
								
								提交建议bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6098ca0257
								
							
								
							
						 | 
						
							
							
								
								运营端-客户高级配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b494e64e78
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b73ab3efce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	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 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5cd92d4377
								
							
								
							
						 | 
						
							
							
								
								党员认证通过后参数调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f322f10315
								
							
								
							
						 | 
						
							
							
								
								党员认证通过后放个调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ad962dd531
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d948ad0b39
								
							
								
							
						 | 
						
							
							
								
								党员认证通过后放个调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								64d5d5bb18
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1866283d87
								
							
								
							
						 | 
						
							
							
								
								修改/epmetuser/userresiinfo/getuserresiinfolist
							
							
							
							
							
							
								
							
							
							/epmetuser/userresiinfo/getuserresiinfo 方法 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7d956831fc
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c718e3a869
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								9876ac9b7d
								
							
								
							
						 | 
						
							
							
								
								advice修改agency_pids字段 sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e5c99f46aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev_issue_audit
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3341fb798
								
							
								
							
						 | 
						
							
							
								
								居民端-对议题发表建议-建议列表查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a23e25cb7c
								
							
								
							
						 | 
						
							
							
								
								党员认证通过后 添加党员徽章信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7b27044013
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govaccess_async' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ea1dd72987
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govaccess_async' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
#	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 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6957e6dc28
								
							
								
							
						 | 
						
							
							
								
								党员认证添加方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8be9aa78c1
								
							
								
							
						 | 
						
							
							
								
								徽章修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								858e1b58c9
								
							
								
							
						 | 
						
							
							
								
								修改:调整权限批量添加,api和方法名称调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								04d993d90c
								
							
								
							
						 | 
						
							
							
								
								添加获取党员徽章方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								56c871faad
								
							
								
							
						 | 
						
							
							
								
								居民端-对议题发表建议
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b98f8feb87
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								02f12b724b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a2c9ccd626
								
							
								
							
						 | 
						
							
							
								
								修改user服务对外提供查询用户基本信息的接口,统一改为取user_base_info表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								05d743e279
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								31bf195e38
								
							
								
							
						 | 
						
							
							
								
								DB key值修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								99ea55660c
								
							
								
							
						 | 
						
							
							
								
								新增:将默认权限同步到所有客户的指定角色的接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								17c089335f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cdd0b6f363
								
							
								
							
						 | 
						
							
							
								
								添加获取党员徽章方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b7e0eff993
								
							
								
							
						 | 
						
							
							
								
								修改userResiInfoDao.selectUserResiInfoDTO,头像取user_base_info表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a01ccc0f26
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1b9e4ff5fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev_personal_center
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/pom.xml
#	epmet-user/epmet-user-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								84d3e7c025
								
							
								
							
						 | 
						
							
							
								
								去掉flyway版本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								821559f1c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								34eb0a3bea
								
							
								
							
						 | 
						
							
							
								
								调整flyway版本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								53dbc537b5
								
							
								
							
						 | 
						
							
							
								
								居民端/resi/hall/issue/detail  接口修改新增返参对议题的建议/意见
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5b388e76b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bec8b47d4f
								
							
								
							
						 | 
						
							
							
								
								sql脚本调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d5e169eba9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a4a83fdb3f
								
							
								
							
						 | 
						
							
							
								
								自测代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f200b8abfb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5e6dd0d610
								
							
								
							
						 | 
						
							
							
								
								徽章查询修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ddd03b272b
								
							
								
							
						 | 
						
							
							
								
								部署statis 解决 难点堵点的抽取逻辑优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								27b0311fb7
								
							
								
							
						 | 
						
							
							
								
								group_code表添加invitationId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fe9bafd32c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3dd2d2899a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								016ed7793c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago |