zxc
							
						 | 
						
							
							
							
								
							
								52318da489
								
							
								
							
						 | 
						
							
							
								
								修改入参,原来固定从token取,改为前端传,没传从token取
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fa3dd8db67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_send_message' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f8e2210f24
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.【发送消息】新增组成员
2.【发送消息】移除组成员
3.【发送消息】修改组信息
4.【发送消息】删除组 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4d5c1b6043
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a0b75c9ad4
								
							
								
							
						 | 
						
							
							
								
								.......
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								517185a897
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								773a2d136b
								
							
								
							
						 | 
						
							
							
								
								日期
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fbba7d7084
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								71179f6cb7
								
							
								
							
						 | 
						
							
							
								
								日期格式修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c03c83ea7a
								
							
								
							
						 | 
						
							
							
								
								新方法添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b314b9d19d
								
							
								
							
						 | 
						
							
							
								
								方法模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								94eb295544
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								061eaaa4cc
								
							
								
							
						 | 
						
							
							
								
								消息列表修改,gov-mine、message
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f91d3d5dc4
								
							
								
							
						 | 
						
							
							
								
								巡查时长秒
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ee58d18d7a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4aa11547fd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_msg
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e84259fe2b
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.【小组成就】返回"groupLeaderFlag"标记,是否是组长 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								16bbc279c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								81ab5393ed
								
							
								
							
						 | 
						
							
							
								
								提交徽章认证信息,存储messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e9c5ab535f
								
							
								
							
						 | 
						
							
							
								
								项目滞留超期提醒,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7c530d7861
								
							
								
							
						 | 
						
							
							
								
								报名爱心互助、活动发布,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3f673101af
								
							
								
							
						 | 
						
							
							
								
								小组内发布通知、编辑通知,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								228020bf97
								
							
								
							
						 | 
						
							
							
								
								禁言组员通知他,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f5d0dfec82
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b9a5c2d171
								
							
								
							
						 | 
						
							
							
								
								方法模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								abb5e472b4
								
							
								
							
						 | 
						
							
							
								
								居民端首页积分排行
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4e0af17048
								
							
								
							
						 | 
						
							
							
								
								转交组长身份,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2c0deecb9b
								
							
								
							
						 | 
						
							
							
								
								小组内取消活动,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5b8c4a374f
								
							
								
							
						 | 
						
							
							
								
								小组内发布活动、编辑活动,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d47324bb8a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a5d41c6f62
								
							
								
							
						 | 
						
							
							
								
								替换回来
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0780071510
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_msg' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea804e9cee
								
							
								
							
						 | 
						
							
							
								
								发布党建声音,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6a02bc00ea
								
							
								
							
						 | 
						
							
							
								
								poi框框
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fda7232373
								
							
								
							
						 | 
						
							
							
								
								立项、结案、退回、事件立项,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4b4c53acba
								
							
								
							
						 | 
						
							
							
								
								项目流转,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2b9f9ee4d4
								
							
								
							
						 | 
						
							
							
								
								议题关闭、议题转项目,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								67f6afe869
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3eeffaab90
								
							
								
							
						 | 
						
							
							
								
								修改下key
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5ab79e7c85
								
							
								
							
						 | 
						
							
							
								
								连接入组的,通知组长xx加入了,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9f89d01355
								
							
								
							
						 | 
						
							
							
								
								组长审核完入群申请,通知居民结果,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e7da49b02d
								
							
								
							
						 | 
						
							
							
								
								居民单申请入群,通知组长审核,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5c42eb58fb
								
							
								
							
						 | 
						
							
							
								
								工作端审核建群申请后,通知建组人结果,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0e54ab3da5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fb0bf99901
								
							
								
							
						 | 
						
							
							
								
								第一版用户统计数据代码优化后还原-相成
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4f4e8f3123
								
							
								
							
						 | 
						
							
							
								
								居民端用户申请创建小组,提交小组信息后,通知网格长,存储targetId,messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d5843a3708
								
							
								
							
						 | 
						
							
							
								
								热心居民申请,审核结果通知居民。记录targetId、messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c22f5070f6
								
							
								
							
						 | 
						
							
							
								
								党员审核申请通知网格长、审核结果通知居民。记录targetId、messageType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b72f9f8887
								
							
								
							
						 | 
						
							
							
								
								热心居民申请,给网格长发送消息记录消息类型、申请id到user_message
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								132482b806
								
							
								
							
						 | 
						
							
							
								
								dto
							
							
							
							
								
							
							
						 | 
						4 years ago |