jianjun
							
						 | 
						
							
							
							
								
							
								2669c4426d
								
							
								
							
						 | 
						
							
							
								
								添加判断解决异常
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9c45ccf8f3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d2d53da859
								
							
								
							
						 | 
						
							
							
								
								事务添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2d422fcea5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								87f8245d50
								
							
								
							
						 | 
						
							
							
								
								publish act
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f3b20d3ad0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0baa38af48
								
							
								
							
						 | 
						
							
							
								
								小组成员成就 只统计小组成员除了组长之外的人
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9b16101acc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3366200bae
								
							
								
							
						 | 
						
							
							
								
								创建小组修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								20591a9ae3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_point' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9bbd4a6534
								
							
								
							
						 | 
						
							
							
								
								小组成就相关接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3c1c31a34e
								
							
								
							
						 | 
						
							
							
								
								时间样式 i
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fcaf59f5f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_temp' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1beb784daa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7f3c93de50
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	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
							
						 | 
						
							
							
							
								
							
								4a86700a3c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d23bc04fb1
								
							
								
							
						 | 
						
							
							
								
								小组成员成就 只统计小组成员除了组长之外的人
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								820272b7cc
								
							
								
							
						 | 
						
							
							
								
								selectLatestTen
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7851f3a440
								
							
								
							
						 | 
						
							
							
								
								小组成就消息变动
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d3a5b09624
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b71e3dab92
								
							
								
							
						 | 
						
							
							
								
								小组历史数据查询添加是否过期字段
							
							
							
							
							
							
								
							
							
							近十条数据添加 是否过期字段 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								57ef5a7c46
								
							
								
							
						 | 
						
							
							
								
								SHOULD_READ
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09a9323d53
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								705b064d86
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a773dc0910
								
							
								
							
						 | 
						
							
							
								
								MESSAGE_ID
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b414e50cc9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f011fe21c6
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f61b573e32
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2fc44c37b3
								
							
								
							
						 | 
						
							
							
								
								组员入组消息发送
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4a0a337583
								
							
								
							
						 | 
						
							
							
								
								需求变更添加通知过期时间引起的代码变化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								db35fa98b1
								
							
								
							
						 | 
						
							
							
								
								需求变更添加通知过期时间引起的代码变化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								650e61f135
								
							
								
							
						 | 
						
							
							
								
								返参增加monthId/dataEndTime,方便知道数据所属月
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7f99539841
								
							
								
							
						 | 
						
							
							
								
								安宁大屏返参增加monthId,方便知道数据所属月
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								22da3840f4
								
							
								
							
						 | 
						
							
							
								
								小组成就消息消费代码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								49c1848058
								
							
								
							
						 | 
						
							
							
								
								签到码界面修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								205b8204c4
								
							
								
							
						 | 
						
							
							
								
								group_message 历史数据sql
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5edde68f6f
								
							
								
							
						 | 
						
							
							
								
								代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c552a44f7f
								
							
								
							
						 | 
						
							
							
								
								代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a51e2253f
								
							
								
							
						 | 
						
							
							
								
								代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7cd8c5a7fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6b13f7c131
								
							
								
							
						 | 
						
							
							
								
								back
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ad7c519ef9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a8c854c894
								
							
								
							
						 | 
						
							
							
								
								修改selectGovernCapacityRatioNew 排序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b74bc32b93
								
							
								
							
						 | 
						
							
							
								
								计算小组成就放入到小组成就表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3c5f10c738
								
							
								
							
						 | 
						
							
							
								
								新的代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cbec07d0b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4cacd464b4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ec23370d22
								
							
								
							
						 | 
						
							
							
								
								效率分析排序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f54b83d033
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3e1c674112
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago |