yinzuomei
							
						 | 
						
							
							
							
								
							
								a2387f1980
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e0291b6e61
								
							
								
							
						 | 
						
							
							
								
								获取当前在组模式(发话题、分享、评论时调用)调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								59dca31978
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								14d5bb7a15
								
							
								
							
						 | 
						
							
							
								
								获取当前在组模式(发话题、分享、评论时调用)调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								49c95a791c
								
							
								
							
						 | 
						
							
							
								
								获取当前在组模式(发话题、分享、评论时调用)调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								05e8816aff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e7fcddb361
								
							
								
							
						 | 
						
							
							
								
								获取当前在组模式(发话题、分享、评论时调用)调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5b37248bae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_workrec' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fd08a6f32b
								
							
								
							
						 | 
						
							
							
								
								工作日志接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								71f15fa58d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d22fc97262
								
							
								
							
						 | 
						
							
							
								
								解决--6、【工作日志】支部建设、联建共建近12月趋势图--接口返回横坐标包含当前月问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								19e8c3e9e8
								
							
								
							
						 | 
						
							
							
								
								工作日志接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4b303826f2
								
							
								
							
						 | 
						
							
							
								
								获取当前在组模式(发话题、分享、评论时调用)
							
							
							
							
							
							
								
							
							
							参观小组(记录日志) 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								975d4511e6
								
							
								
							
						 | 
						
							
							
								
								setvisitswitch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a476a9272
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3ea9d2738a
								
							
								
							
						 | 
						
							
							
								
								小组管理-设置是否允许参观
							
							
							
							
							
							
								
							
							
							小组管理-界面初始化 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e26b93807
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e1bbddcde2
								
							
								
							
						 | 
						
							
							
								
								修改版本号
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d1298ec4c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5bddd70179
								
							
								
							
						 | 
						
							
							
								
								创建小组接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bd6749f428
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_add_customer_id' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3d30bc5723
								
							
								
							
						 | 
						
							
							
								
								项目滞留短信推送逻辑调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								97914ad8d3
								
							
								
							
						 | 
						
							
							
								
								groupvisitor漏题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1b2bec280e
								
							
								
							
						 | 
						
							
							
								
								生成代码提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cd1661ed73
								
							
								
							
						 | 
						
							
							
								
								参观组sql脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ab21037c3a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev
							
							
							
							
							
							
								
							
							
							# 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
							
						 | 
						
							
							
							
								
							
								a67c8529a8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_add_customer_id' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2baa2c0a63
								
							
								
							
						 | 
						
							
							
								
								测试短信发送内容
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d99618d433
								
							
								
							
						 | 
						
							
							
								
								项目发送到第三方平台
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6f1f2baeee
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0441b84afa
								
							
								
							
						 | 
						
							
							
								
								评论列表接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09a25d486a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group0329' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0e76d4f322
								
							
								
							
						 | 
						
							
							
								
								ResiGroupMemberRedis.get方法修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1c47e0779a
								
							
								
							
						 | 
						
							
							
								
								setCacheUserInfoWithIssue 方法修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								55acd7c84a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8d10c15bcb
								
							
								
							
						 | 
						
							
							
								
								调用第三方打印日志;项目回调地址 动态生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								505e8c3826
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ca04217a19
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9a3e7296fc
								
							
								
							
						 | 
						
							
							
								
								项目分类bug修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5b01db5e9d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7fd52560d5
								
							
								
							
						 | 
						
							
							
								
								项目发送到第三方平台
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								79c0991405
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0d83b40532
								
							
								
							
						 | 
						
							
							
								
								统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c6750d20ed
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								894dc584b3
								
							
								
							
						 | 
						
							
							
								
								解决sql脚本冲突问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cda2332c13
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_issue_category' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								87e0cb75df
								
							
								
							
						 | 
						
							
							
								
								解决sql脚本冲突问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								90575798dc
								
							
								
							
						 | 
						
							
							
								
								获取第三方token重试2次
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e95d3a210d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_issue_category' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9a0fd3f66e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |