|  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 | 
				
					
						|  zxc | eca7c1e3cc | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | 5a4caba09a | Merge remote-tracking branch 'origin/dev_temp' into dev_temp | 5 years ago | 
				
					
						|  zxc | 4257985e73 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | a2d7532595 | 徽章 | 5 years ago | 
				
					
						|  jianjun | d340baa3b3 | Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp # Conflicts:
#	epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java | 5 years ago | 
				
					
						|  jianjun | e82eaf53ec | 业务数据抽取统计 添加聚合入口,便于 删除网格后 | 5 years ago | 
				
					
						|  zxc | 0f79010450 | 徽章、我参与的议题 | 5 years ago | 
				
					
						|  wxz | 776d6f3092 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center | 5 years ago | 
				
					
						|  wxz | 9ac03f65d0 | 新增:个人中心-我发表的话题列表 增加分页 | 5 years ago | 
				
					
						|  zxc | b0eab2d9f6 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp # Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml | 5 years ago | 
				
					
						|  zxc | 121cf34f61 | 徽章 | 5 years ago | 
				
					
						|  wxz | 62b0eb9995 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center | 5 years ago | 
				
					
						|  wxz | 18508ba133 | 新增:个人中心-我发表的话题列表,网格名称查询TODO | 5 years ago | 
				
					
						|  liushaowen | 982f63f4cb | Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud into dev_temp | 5 years ago | 
				
					
						|  liushaowen | 88839f72eb | Merge branch 'dev_personal_center' into dev_temp # Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 years ago | 
				
					
						|  liushaowen | c215274733 | 居民端-提交建议 | 5 years ago | 
				
					
						|  zxc | 545bc2215c | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | 8f3878c9ac | 徽章 | 5 years ago | 
				
					
						|  zxc | fba37ee301 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | 61b9ac47d9 | 徽章认证详情 | 5 years ago | 
				
					
						|  zxc | 9103781ca3 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | b938e5e0c3 | 徽章 | 5 years ago | 
				
					
						|  zxc | 04a00698ed | Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp | 5 years ago | 
				
					
						|  zxc | a32606c1a4 | 徽章修改 | 5 years ago | 
				
					
						|  wangchao | 5ec92813b1 | Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center | 5 years ago | 
				
					
						|  zxc | f86e6bb09c | 徽章初始化添加方法 | 5 years ago | 
				
					
						|  wangchao | 82cf902db8 | redis pipelined批量取值加上解析器 | 5 years ago | 
				
					
						|  zxc | 50230da566 | issue | 5 years ago | 
				
					
						|  sunyuchao | 8590a12fcc | Merge branch 'dev_wx_msg' into dev | 5 years ago | 
				
					
						|  sunyuchao | 0eb24d42a0 | 消息推送生产环境获取accesstoken错误问题 | 5 years ago | 
				
					
						|  zhaoqifeng | bd7685fb99 | 徽章审核修改 | 5 years ago | 
				
					
						|  jianjun | 34bafa0a10 | Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp # Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 years ago | 
				
					
						|  jianjun | 3e76fdb481 | Merge remote-tracking branch 'remotes/origin/dev' into dev_personal_center # Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.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 | 5 years ago | 
				
					
						|  liushaowen | f5eb1fbb98 | Merge branch 'dev_personal_center' into dev_temp | 5 years ago |