zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cdebb28fef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e46f7c1a0f
								
							
								
							
						 | 
						
							
							
								
								单条消息已读bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e4c42cee9e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6870daec2b
								
							
								
							
						 | 
						
							
							
								
								transferToGroupInfoRedis接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9b9c78ebc4
								
							
								
							
						 | 
						
							
							
								
								redis地址改为10.10.10.248
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a55be16c4e
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								82c3b5f98f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c05f11ac41
								
							
								
							
						 | 
						
							
							
								
								组信息存入缓存
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4e2ba3b6c6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6993954371
								
							
								
							
						 | 
						
							
							
								
								居民注册
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9d7b034010
								
							
								
							
						 | 
						
							
							
								
								进入网格增加网格Id传参
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5a0f1dfce0
								
							
								
							
						 | 
						
							
							
								
								用戶信息權限查詢sql修改,增加gridId校驗,熱心居民:網格級別,注冊居民與黨員:客戶級別。
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								be986e8e23
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a48bfb982f
								
							
								
							
						 | 
						
							
							
								
								同意邀请进组接口修改、创建小组界面初始化接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								706b8a723a
								
							
								
							
						 | 
						
							
							
								
								用户角色表新增网格Id字段带来的程序变动-漏提文件
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								694dceb22d
								
							
								
							
						 | 
						
							
							
								
								用户角色表新增网格Id对应的程序改动
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								379baac9dd
								
							
								
							
						 | 
						
							
							
								
								user_role表添加网格ID字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4e1b96defa
								
							
								
							
						 | 
						
							
							
								
								user_role表添加网格ID字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bb1ab108a2
								
							
								
							
						 | 
						
							
							
								
								热心居民申请-提示语修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								910df3121a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0839cb4c35
								
							
								
							
						 | 
						
							
							
								
								热心居民申请程序加逻辑限定
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9bca882d67
								
							
								
							
						 | 
						
							
							
								
								加入小组入参判断改为:入组理由不能为空
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9221264bb3
								
							
								
							
						 | 
						
							
							
								
								进入小组时查询组-客户关系列表,保证唯一性
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e1e604d681
								
							
								
							
						 | 
						
							
							
								
								党员认证bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								89f0dd216d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78cabea3f4
								
							
								
							
						 | 
						
							
							
								
								待审核列表接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c3e5b78e8f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0e25b27371
								
							
								
							
						 | 
						
							
							
								
								评论列表、话题列表显示时间到分钟,用户信息获取,屏蔽话题与解除屏蔽对群组统计信息进行相应的补充
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a8b6cec152
								
							
								
							
						 | 
						
							
							
								
								修改 获取居民注册信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								822a190e1c
								
							
								
							
						 | 
						
							
							
								
								错误提交修正
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b2766a8b3f
								
							
								
							
						 | 
						
							
							
								
								删除错误import
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								461c59b1c8
								
							
								
							
						 | 
						
							
							
								
								修改 认证成功后添加角色
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b7f5e8b909
								
							
								
							
						 | 
						
							
							
								
								党员认证bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								24cfd06fcf
								
							
								
							
						 | 
						
							
							
								
								居民注册、热心居民申请模块接口优化(返参 提示语)
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9ee2e3d725
								
							
								
							
						 | 
						
							
							
								
								推荐群返参新增status,ErrorCode添加注释
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								776f21f253
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f2536eabcc
								
							
								
							
						 | 
						
							
							
								
								楼院小组-删除组成员-程序优化
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a063fcfc3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								25828f49c0
								
							
								
							
						 | 
						
							
							
								
								8006:此邀请链接已过期
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								484ba2c5c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f70ce9dd05
								
							
								
							
						 | 
						
							
							
								
								楼院小组-删除组成员接口首次提交
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								704e340df2
								
							
								
							
						 | 
						
							
							
								
								删除80005
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dd9b946350
								
							
								
							
						 | 
						
							
							
								
								EpmetErrorCode 修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bfa9d7046d
								
							
								
							
						 | 
						
							
							
								
								docker-compose.yml 版本修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1980789aa0
								
							
								
							
						 | 
						
							
							
								
								docker-compose.yml 版本修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								88ada95a74
								
							
								
							
						 | 
						
							
							
								
								docker-compose.yml 网络修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a30c77ecd3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev0.2' into dev0.2
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5494d49688
								
							
								
							
						 | 
						
							
							
								
								根据链接查询群组信息接口修改记录用户邀请关系bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f0a69df06c
								
							
								
							
						 | 
						
							
							
								
								docker-compose.yml批量修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								451f053fb7
								
							
								
							
						 | 
						
							
							
								
								增加gateway的docker-compose.yml和Dockerfile
							
							
							
							
								
							
							
						 | 
						6 years ago |