sunyuchao
							
						 | 
						
							
							
							
								
							
								3f93adb75c
								
							
								
							
						 | 
						
							
							
								
								少包
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ce79ec7ec0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_graceful_shutdown' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9c17111caa
								
							
								
							
						 | 
						
							
							
								
								为客户初始化角色信息,增加已存在的判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1ec667b71a
								
							
								
							
						 | 
						
							
							
								
								引入Rocketmq
							
							
							
							
							
							
								
							
							
							修改客户初始化操作,使用rocketmq发送消息完成初始化 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0acb7dd8fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_graceful_shutdown' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ccb5c536da
								
							
								
							
						 | 
						
							
							
								
								项目附件、议题项目内容汇聚发布生产
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c7f2587b45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5ba1f09ff2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_branch' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								57f48ed6a6
								
							
								
							
						 | 
						
							
							
								
								订阅消息4
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								74c41fb6b7
								
							
								
							
						 | 
						
							
							
								
								订阅消息3
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8e7277bdc0
								
							
								
							
						 | 
						
							
							
								
								已转项目修改排序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2a6cdcab09
								
							
								
							
						 | 
						
							
							
								
								数据改版先进支部接口调整、新消息订阅third服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2657984b0f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								32a59e5a44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								28bdef86e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_mess_party' of http://121.42.41.42:7070/r/epmet-cloud into dev_mess_party
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								591a2979e6
								
							
								
							
						 | 
						
							
							
								
								订阅消息 2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								91b20d3821
								
							
								
							
						 | 
						
							
							
								
								模板列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cdddc6b51f
								
							
								
							
						 | 
						
							
							
								
								添加客户配置开关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								41b14f9a72
								
							
								
							
						 | 
						
							
							
								
								数据模块-先进支部排行接口调整  名称为组织-网格
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								2a050b192e
								
							
								
							
						 | 
						
							
							
								
								revert third
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								cee6f67841
								
							
								
							
						 | 
						
							
							
								
								消息订阅
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c056498d46
								
							
								
							
						 | 
						
							
							
								
								添加客户配置开关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								db9439ab98
								
							
								
							
						 | 
						
							
							
								
								添加客户配置开关
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								734b83ce6d
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart接口修改 +1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a87e9dd2dd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d357d59631
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart,横坐标修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								53f04a4985
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart接口修改 +1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4fff997a0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								401b8a3d1c
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c95f783f74
								
							
								
							
						 | 
						
							
							
								
								report->60
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								aba84c6284
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								54eb1ebac0
								
							
								
							
						 | 
						
							
							
								
								指数查询接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								3503eda584
								
							
								
							
						 | 
						
							
							
								
								注释维护
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								af9fce892f
								
							
								
							
						 | 
						
							
							
								
								议题-全部修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e9639888f2
								
							
								
							
						 | 
						
							
							
								
								待审核添加 issueApplicationId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1061683468
								
							
								
							
						 | 
						
							
							
								
								已转项目添加 issueTitle
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a9e6122eb5
								
							
								
							
						 | 
						
							
							
								
								客户ID,key
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								30f87ce08c
								
							
								
							
						 | 
						
							
							
								
								议题总数修改,议题审核被拒绝修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4ecbdf799b
								
							
								
							
						 | 
						
							
							
								
								原始话题转成项目接口发送积分事件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d5a0d65155
								
							
								
							
						 | 
						
							
							
								
								初始化短信条数 5000
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4921fda5bc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								857cb7137f
								
							
								
							
						 | 
						
							
							
								
								议题总数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								918162bafd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b779d862b7
								
							
								
							
						 | 
						
							
							
								
								修改:修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41a98879a4
								
							
								
							
						 | 
						
							
							
								
								修改:补充
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								617f742239
								
							
								
							
						 | 
						
							
							
								
								审核ID添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e32d873ef2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b9057df5c7
								
							
								
							
						 | 
						
							
							
								
								修改:在前端无法做oss私有链接适配的情况下,暂且使用/internal目录来区分私有文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9aa0beb557
								
							
								
							
						 | 
						
							
							
								
								客户配置信息更新
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3a4a87987c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago |