wangchao
							
						 | 
						
							
							
							
								
							
								8b513b3bee
								
							
								
							
						 | 
						
							
							
								
								话题部分接口将居民端和政府端分开
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								93a33f371c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govorg' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e6be5294e5
								
							
								
							
						 | 
						
							
							
								
								服务升级group
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0db81f8870
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20c65b5547
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d6e5539aea
								
							
								
							
						 | 
						
							
							
								
								网格添加、修改代码优化
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6945957e1c
								
							
								
							
						 | 
						
							
							
								
								代码错提问题修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a3f7fa6328
								
							
								
							
						 | 
						
							
							
								
								数据权限:DataFIlter增加上级相关过滤
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9a40bea683
								
							
								
							
						 | 
						
							
							
								
								居民端-根据userId获取用户访问过的网格列表
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9de299abf8
								
							
								
							
						 | 
						
							
							
								
								建组审核详情,修改群主名称,显示格式为:街道-名称
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								bb4be54596
								
							
								
							
						 | 
						
							
							
								
								调整applygroupdetail接口返回参数,去除多余属性,与接口文档上保持一致,不能暴露数据库相关属性。
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2b8b914e28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3a5781d360
								
							
								
							
						 | 
						
							
							
								
								删除test方法group/test/{test}
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2f200dba62
								
							
								
							
						 | 
						
							
							
								
								删除多余的常量
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								34aaf22b4f
								
							
								
							
						 | 
						
							
							
								
								消息模板移动位置,政府端查看话题bug修复
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4cef507ed5
								
							
								
							
						 | 
						
							
							
								
								数据校验异常统一返回7000
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								f78ff7facf
								
							
								
							
						 | 
						
							
							
								
								建组审核同意模板修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								6312dc700a
								
							
								
							
						 | 
						
							
							
								
								建群审核发送消息APP改为GOV
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0cc449e4ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								52a44050e0
								
							
								
							
						 | 
						
							
							
								
								审核建群后发送消息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								aa8ee4f01b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a319256c3e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cf8086ea86
								
							
								
							
						 | 
						
							
							
								
								数据权限部分:
							
							
							
							
							
							
								
							
							
							1.in grid,in department新的逻辑
2.新的缓存逻辑 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								43f61c8593
								
							
								
							
						 | 
						
							
							
								
								小组介绍bug修改1
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a31168bdc7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8f7be34e94
								
							
								
							
						 | 
						
							
							
								
								小组介绍bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d20ff312c4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								1f60e2b4b0
								
							
								
							
						 | 
						
							
							
								
								小组申请时查询组介绍
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c6b15f2fc6
								
							
								
							
						 | 
						
							
							
								
								BUG修复
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9bd561cc59
								
							
								
							
						 | 
						
							
							
								
								人员添加编辑手机号验证失败返回信息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								d60fe487ca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4e3463e23f
								
							
								
							
						 | 
						
							
							
								
								addGrid时的pids,查询创建小组申请详情的date字段使用jsonFormat
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7d087cb0a1
								
							
								
							
						 | 
						
							
							
								
								gridFullPath修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6e346b39f8
								
							
								
							
						 | 
						
							
							
								
								党员认证-待审核列表、审核历史接口bug修改发布,群组审核bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf0a318c1c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								75dd6970fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a29ee93554
								
							
								
							
						 | 
						
							
							
								
								党员认证-待审核列表、审核历史接口bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3141ec1efb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dfb0afb088
								
							
								
							
						 | 
						
							
							
								
								epmet-group服务参数加@RequestBody
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c2fc29611f
								
							
								
							
						 | 
						
							
							
								
								被调用的服务参数加@RequestBody
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3494dba942
								
							
								
							
						 | 
						
							
							
								
								党员认证添加消息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								60ff964c30
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d5ccb34eab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								549569f7b8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								893e39caf5
								
							
								
							
						 | 
						
							
							
								
								message模块不能调用外部服务
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								056fd8a89f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								0ece1d1287
								
							
								
							
						 | 
						
							
							
								
								查询用户最后一次登陆的网格,sql修正
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dbea3a6e50
								
							
								
							
						 | 
						
							
							
								
								epmetMessage sendMsg
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ffdfc0d51a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3c9ab7561f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_govgrid' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago |