jianjun
							
						 | 
						
							
							
							
								
							
								4b9ff3177d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c454ee9433
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1f88b8b961
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_user_cache' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7e8e1e10d9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_20210401_bug' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								af654ba49c
								
							
								
							
						 | 
						
							
							
								
								外挂接口新增返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f6edba2b83
								
							
								
							
						 | 
						
							
							
								
								小组审核生成二维码报错
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ae7244d568
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d907cfbc28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								66886e45aa
								
							
								
							
						 | 
						
							
							
								
								oper-customer 版本号升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								60c36c6ad8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1760665358
								
							
								
							
						 | 
						
							
							
								
								处理用户基础信息 报错,设置默认空字符串
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								863f625f27
								
							
								
							
						 | 
						
							
							
								
								处理用户基础信息 报错
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b2e6a45541
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize_ljj
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								82a23663c1
								
							
								
							
						 | 
						
							
							
								
								添加注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d305c08aa5
								
							
								
							
						 | 
						
							
							
								
								平阴数据bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5b7705296b
								
							
								
							
						 | 
						
							
							
								
								可胜任组长-组员列表(工作端通用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								b310170a70
								
							
								
							
						 | 
						
							
							
								
								定制功能列表 添加分页
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e69ba7d130
								
							
								
							
						 | 
						
							
							
								
								可胜任组长-组员列表(工作端通用)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8e54b66bfd
								
							
								
							
						 | 
						
							
							
								
								修改:openapi未传递token,则提示请求未认证
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b1bd75a61c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								80e87810ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d798d0fcd3
								
							
								
							
						 | 
						
							
							
								
								去掉调试日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								714fd06539
								
							
								
							
						 | 
						
							
							
								
								党建声音pdf功能上线
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b024c7aa3b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3abed293ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7f22d27e2b
								
							
								
							
						 | 
						
							
							
								
								升级aliyun-sdk-oss
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								8b601d4258
								
							
								
							
						 | 
						
							
							
								
								data-stats  服务升级   125   -> 126
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								cc08745fe3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								78fa18f510
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_0329_whistled_project_count' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7d0333004a
								
							
								
							
						 | 
						
							
							
								
								修改评价周期内被吹哨项目数与评价周期内被办结项目数的算法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								852a7baf52
								
							
								
							
						 | 
						
							
							
								
								屏蔽话题默认理由修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								568c600c90
								
							
								
							
						 | 
						
							
							
								
								重复提交使用@Before注解->还需要优化 本地缓存解决不了 分布式
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ff8bea4200
								
							
								
							
						 | 
						
							
							
								
								删除无用代码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c5e855590e
								
							
								
							
						 | 
						
							
							
								
								user服务升级:/epmet/ext/user/userinfo接口日志降级,且继续执行
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3de03f63a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a4a1790ff5
								
							
								
							
						 | 
						
							
							
								
								oss方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f903f93368
								
							
								
							
						 | 
						
							
							
								
								/epmet/ext/user/userinfo接口日志降级,且继续执行
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0472bdfd52
								
							
								
							
						 | 
						
							
							
								
								查找组长异常信息修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								25969c33c5
								
							
								
							
						 | 
						
							
							
								
								11
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								26c8146c23
								
							
								
							
						 | 
						
							
							
								
								屏蔽话题,群组话题总数也要减少
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d655c70fa0
								
							
								
							
						 | 
						
							
							
								
								oss方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								86caa3708e
								
							
								
							
						 | 
						
							
							
								
								oss方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a63ba5a74c
								
							
								
							
						 | 
						
							
							
								
								/resi/group/group/getgroupsummarize接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								64a19b19d6
								
							
								
							
						 | 
						
							
							
								
								自测接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								015303e141
								
							
								
							
						 | 
						
							
							
								
								转让组接口,修改组成员缓存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f1886ce21a
								
							
								
							
						 | 
						
							
							
								
								删除组员添加在群组统计表数据、话题操作记录表数据修改逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								63725e21cf
								
							
								
							
						 | 
						
							
							
								
								oss删除方法优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fee3efa95c
								
							
								
							
						 | 
						
							
							
								
								oss上传文件代码重复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								78bcaea9e6
								
							
								
							
						 | 
						
							
							
								
								oss删除文件 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bdcb8947dd
								
							
								
							
						 | 
						
							
							
								
								oss删除文件 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago |