sunyuchao
							
						 | 
						
							
							
							
								
							
								25969c33c5
								
							
								
							
						 | 
						
							
							
								
								11
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f5ff8b0c57
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								26c8146c23
								
							
								
							
						 | 
						
							
							
								
								屏蔽话题,群组话题总数也要减少
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								679a0b5b36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d655c70fa0
								
							
								
							
						 | 
						
							
							
								
								oss方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a743eea890
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								86caa3708e
								
							
								
							
						 | 
						
							
							
								
								oss方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c04e3f0dd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a63ba5a74c
								
							
								
							
						 | 
						
							
							
								
								/resi/group/group/getgroupsummarize接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								f1e8a8680e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-customerfunction' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								171fbb06bb
								
							
								
							
						 | 
						
							
							
								
								客户配置可见菜单接口,如果客户列表为空,则所有客户都不配置这个菜单了
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b29ded74f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								64a19b19d6
								
							
								
							
						 | 
						
							
							
								
								自测接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ca9cf61e98
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								015303e141
								
							
								
							
						 | 
						
							
							
								
								转让组接口,修改组成员缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bed78df3b0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f1886ce21a
								
							
								
							
						 | 
						
							
							
								
								删除组员添加在群组统计表数据、话题操作记录表数据修改逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								403ee4927f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								63725e21cf
								
							
								
							
						 | 
						
							
							
								
								oss删除方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								033baa6272
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fee3efa95c
								
							
								
							
						 | 
						
							
							
								
								oss上传文件代码重复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dbeed20e60
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								78bcaea9e6
								
							
								
							
						 | 
						
							
							
								
								oss删除文件 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1692fdc765
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bdcb8947dd
								
							
								
							
						 | 
						
							
							
								
								oss删除文件 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								da542c9c67
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								366ee1edfd
								
							
								
							
						 | 
						
							
							
								
								oss删除文件 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7942f09912
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d608a89c87
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_group0329
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e05295ae67
								
							
								
							
						 | 
						
							
							
								
								接口自测问题修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3b8e43648d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a28485378
								
							
								
							
						 | 
						
							
							
								
								oss删除文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2ab5a8d3ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								33c2391798
								
							
								
							
						 | 
						
							
							
								
								oss删除文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bb2238013c
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								456e63b954
								
							
								
							
						 | 
						
							
							
								
								可胜任组长-组员列表(工作端通用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								74bbe6258b
								
							
								
							
						 | 
						
							
							
								
								小组成员删除
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c67d86d16d
								
							
								
							
						 | 
						
							
							
								
								删除党建声音文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2c9b55b402
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_attachment' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c0ec3f3a36
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								98806364b4
								
							
								
							
						 | 
						
							
							
								
								修复:jwt过期之后,取过期时间为空,造成的空指针问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2506cff2fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6be68765de
								
							
								
							
						 | 
						
							
							
								
								返回文件名称
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								342935e782
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4845bf3f03
								
							
								
							
						 | 
						
							
							
								
								文章内容 如果为文件 则校验文件名不能为空
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ecf0811b67
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b135bda98a
								
							
								
							
						 | 
						
							
							
								
								转让组接口v2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								98af8a04be
								
							
								
							
						 | 
						
							
							
								
								评价周期内被吹哨且被办结的项目数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2a20d01b90
								
							
								
							
						 | 
						
							
							
								
								转让组接口v1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								50a2792505
								
							
								
							
						 | 
						
							
							
								
								查找群主:resi_group_member.GROUP_LEADER_FLAG = 'leader'
							
							
							
							
								
							
							
						 | 
						5 years ago |