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 | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								68e4833d49
								
							
								
							
						 | 
						
							
							
								
								DTO
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3a25ada1ff
								
							
								
							
						 | 
						
							
							
								
								xxxx
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7f47add383
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3028fe1a36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_msg' into dev_group_msg
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cb0c6f7730
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1443c242bb
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b870de930e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1783725b73
								
							
								
							
						 | 
						
							
							
								
								指南详情防止报空指针异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bcc7d26b69
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ef07c1406
								
							
								
							
						 | 
						
							
							
								
								项目详情,只有工作人员查询缓存接口,需要发布:user、report服务
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e21a4d8ae5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								927687d698
								
							
								
							
						 | 
						
							
							
								
								指南详情防止报空指针异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f0af01bec7
								
							
								
							
						 | 
						
							
							
								
								指南详情防止报空指针异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3c9eb71a27
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b0c64065e5
								
							
								
							
						 | 
						
							
							
								
								添加指南修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								58ac365d5f
								
							
								
							
						 | 
						
							
							
								
								办事指南相关表添加, 默认分类sql
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f170d48f49
								
							
								
							
						 | 
						
							
							
								
								工作人员缓存增加agencyID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								df6865f577
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6068aa0279
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.我的小组排名接口,去掉userId传入,改用token取 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9fafe51c71
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_msg' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2eebe89a5d
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							【小组排名】,去掉PageData,直接展示列表 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								15ec8ca593
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								06c6a152d7
								
							
								
							
						 | 
						
							
							
								
								获取办事指南内容模块
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								17cd89355a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4147a7291e
								
							
								
							
						 | 
						
							
							
								
								添加注释:大屏新增普通事件列表:首次查询平阴整个客户下,近30天内的项目,展示分类名称(前端截取第一个-之前的文字)、颜色等级、项目标题。点击8个街道,联动。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c58018ee16
								
							
								
							
						 | 
						
							
							
								
								获取办事指南内容模块
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d3c876faac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_guidance' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e039818a42
								
							
								
							
						 | 
						
							
							
								
								指南列表修改
							
							
							
							
								
							
							
						 | 
						4 years ago |