yinzuomei
							
						 | 
						
							
							
							
								
							
								652918b778
								
							
								
							
						 | 
						
							
							
								
								活动评论
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2bc6277699
								
							
								
							
						 | 
						
							
							
								
								创建小组选择组类型
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0bb781fcd4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3e6edb6b96
								
							
								
							
						 | 
						
							
							
								
								act_read_record:read=>read_flag
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d155cca038
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4b8096b763
								
							
								
							
						 | 
						
							
							
								
								建组设置表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dd1f00de9e
								
							
								
							
						 | 
						
							
							
								
								发布活动,至多3张图片
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0ff1cd4c88
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								effacacffa
								
							
								
							
						 | 
						
							
							
								
								act_read_record新增grid_id、group_id
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d1a125765b
								
							
								
							
						 | 
						
							
							
								
								小组通知阅读状态修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3b4ecb6b5b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d3f9708c8
								
							
								
							
						 | 
						
							
							
								
								签到、签到记录
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2d93f06936
								
							
								
							
						 | 
						
							
							
								
								查询组内近十条数据框框
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9329921568
								
							
								
							
						 | 
						
							
							
								
								已读未读消息新增添加组长已读记录,查询列表不查询组长已读未读记录
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b9afe4a0fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d362e9c756
								
							
								
							
						 | 
						
							
							
								
								设置(修改)签到时间
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d3b8fceefc
								
							
								
							
						 | 
						
							
							
								
								入组方式添加支部小组校验
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a89fd3c87b
								
							
								
							
						 | 
						
							
							
								
								所有小组查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								67c18b2685
								
							
								
							
						 | 
						
							
							
								
								活动评论
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1805fe1e04
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								44667fad07
								
							
								
							
						 | 
						
							
							
								
								取消活动
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5f2cadbd95
								
							
								
							
						 | 
						
							
							
								
								8098ErrorCode添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8b31d0acf7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cfac35ed5f
								
							
								
							
						 | 
						
							
							
								
								活动已读未读列表,活动详情 暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								73531fd1f1
								
							
								
							
						 | 
						
							
							
								
								通知评论列表查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								11bf503e0f
								
							
								
							
						 | 
						
							
							
								
								发布通知评论
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6df4119682
								
							
								
							
						 | 
						
							
							
								
								审核通过时,添加小组类型
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ebf745bf6b
								
							
								
							
						 | 
						
							
							
								
								小组通知详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								470d742651
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3f5e652147
								
							
								
							
						 | 
						
							
							
								
								发布/编辑活动
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								184adf4a62
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								386001d926
								
							
								
							
						 | 
						
							
							
								
								通知已读未读列表查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								525764588c
								
							
								
							
						 | 
						
							
							
								
								创建小组修改不是党员不能创建支部小组,
							
							
							
							
							
							
								
							
							
							待审核的小组列表反参添加groupType 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c81c9c66d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2dd616a619
								
							
								
							
						 | 
						
							
							
								
								小组通知、活动分享
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								40ce017e74
								
							
								
							
						 | 
						
							
							
								
								8905错误编码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								58cd53468f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a36e5444ef
								
							
								
							
						 | 
						
							
							
								
								楼院小组新增错误编码,8903、8904
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6b1a6192d7
								
							
								
							
						 | 
						
							
							
								
								小组通知变更
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea11682f49
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								18bffe8aa1
								
							
								
							
						 | 
						
							
							
								
								楼院小组新增错误编码,8901、8902,日后楼院小组统一用89xx吧
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4d4f47c5e6
								
							
								
							
						 | 
						
							
							
								
								推荐小组添加 groupType,小组类型 != 支部
							
							
							
							
							
							
								
							
							
							我的小组添加groupType 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6439fa4db0
								
							
								
							
						 | 
						
							
							
								
								创建小组添加 groupType
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eed1afa908
								
							
								
							
						 | 
						
							
							
								
								创建小组添加 groupType
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61c2ed6ad7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								06467acabf
								
							
								
							
						 | 
						
							
							
								
								活动类别字典
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c723ecd776
								
							
								
							
						 | 
						
							
							
								
								编译
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fa76242e0b
								
							
								
							
						 | 
						
							
							
								
								小组通知保存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								93ce9becdd
								
							
								
							
						 | 
						
							
							
								
								列名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3e6c154f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago |