|  jianjun | a2c0eb0ea8 | Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev | 5 years ago | 
				
					
						|  yinzuomei | 567029b0f9 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center | 5 years ago | 
				
					
						|  yinzuomei | 71958d8bfa | 个人中心-我发起的议题列表-已关闭 | 5 years ago | 
				
					
						|  sunyuchao | a10654d1cb | 修复关于10.27提交代码错误的把历史接口返参dto替换调的问题-PC工作端登陆获取用户基本信息接口 | 5 years ago | 
				
					
						|  jianjun | 0325d7df2e | 统计公众参与 添加判断,存在 网格Id不存在的情况 | 5 years ago | 
				
					
						|  wxz | 76c94e1832 | 修改:个人中心-我的话题列表接口,返回值增加releaseGridName字段 | 5 years ago | 
				
					
						|  wxz | b37e75b312 | Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp | 5 years ago | 
				
					
						|  wxz | ad947e9d4a | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  wxz | a5890c17b3 | Merge branch 'dev_personal_center' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_personal_center | 5 years ago | 
				
					
						|  wxz | e3540f13cd | 修改:权限枚举增加徽章管理模块 | 5 years ago | 
				
					
						|  yinzuomei | b1fadfc857 | 合并代码走丢了 | 5 years ago | 
				
					
						|  yinzuomei | 2961f7038d | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center # 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-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/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/IssueDao.xml
#	epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java
#	epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/IssueService.java
#	epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java | 5 years ago | 
				
					
						|  yinzuomei | 38d70dd456 | 我发起的议题已关闭+已转项目 | 5 years ago | 
				
					
						|  liushaowen | d8ea7df7c6 | Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp # Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java | 5 years ago | 
				
					
						|  liushaowen | d67b72dcdd | Merge branch 'dev_personal_center' 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/group/controller/ResiGroupController.java
#	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/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml | 5 years ago | 
				
					
						|  wxz | 81111182fc | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  wxz | 3b6c4b224c | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center | 5 years ago | 
				
					
						|  wxz | ae46b8ee8e | 修改:增加徽章审核权限枚举 | 5 years ago | 
				
					
						|  liushaowen | e9b5e61b2e | 我的建议列表新增建议类型 | 5 years ago | 
				
					
						|  zxc | 9946c80b54 | Merge remote-tracking branch 'origin/dev_temp' into dev_temp | 5 years ago | 
				
					
						|  zxc | 6a48054f6d | Merge remote-tracking branch 'origin/dev_personal_center' 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/group/controller/ResiGroupController.java
#	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/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml | 5 years ago | 
				
					
						|  wxz | 1173d99d8a | Merge branch 'dev_gateway_whitelist' into dev_temp | 5 years ago | 
				
					
						|  wxz | fa7143f955 | 修改:gateway新增内部接口url白名单 | 5 years ago | 
				
					
						|  zxc | e7b30034b0 | 我发起的议题-表决中 | 5 years ago | 
				
					
						|  liushaowen | d8bd2801ca | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  liushaowen | f5bb49acfe | 添加dto | 5 years ago | 
				
					
						|  wangchao | 02087e11fa | 话题接口加上徽章 | 5 years ago | 
				
					
						|  sunyuchao | 3170044899 | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | 41b1e7d345 | 接口测试问题修改 | 5 years ago | 
				
					
						|  liushaowen | b698fc9dfc | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  liushaowen | 52667f9eb4 | 我的建议列表bug修复 | 5 years ago | 
				
					
						|  liushaowen | 487736695c | Merge branch 'dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  liushaowen | ba84fb5ca9 | Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center | 5 years ago | 
				
					
						|  liushaowen | be5266fa87 | 解决冲突 | 5 years ago | 
				
					
						|  zhaoqifeng | c2f8c4c994 | 账号安全-修改手机号 | 5 years ago | 
				
					
						|  liushaowen | 0903b90f87 | Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center # Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 years ago | 
				
					
						|  liushaowen | 5822b86a66 | 补充fallback | 5 years ago | 
				
					
						|  liushaowen | 62a06a1b87 | Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp | 5 years ago | 
				
					
						|  liushaowen | 57c6255798 | Merge remote-tracking branch 'origin/dev_personal_center' 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/resources/logback-spring.xml | 5 years ago | 
				
					
						|  zhaoqifeng | c803be8cb6 | 账号安全-修改手机号 | 5 years ago | 
				
					
						|  zxc | 38032e1035 | 议题入参 | 5 years ago | 
				
					
						|  liushaowen | 2dd3615dee | 建议-resi模块修改 | 5 years ago | 
				
					
						|  liushaowen | 2e47c80379 | Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center | 5 years ago | 
				
					
						|  liushaowen | e834c9b967 | 我的建议列表添加ifnull | 5 years ago | 
				
					
						|  sunyuchao | fe99f824be | 个人中心-我参与的项目列表 | 5 years ago | 
				
					
						|  zxc | 8545acc885 | 常量 | 5 years ago | 
				
					
						|  jianjun | 8cbda2cfab | Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp | 5 years ago | 
				
					
						|  jianjun | 96d1ad3ef3 | 标签错误 | 5 years ago | 
				
					
						|  jianjun | 88e9dea55a | Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp | 5 years ago | 
				
					
						|  jianjun | 0ca6b0dabc | 判断错误 | 5 years ago |