jianjun
							
						 | 
						
							
							
							
								
							
								94e0b3f2bf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								177bd20055
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								86491ef62c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fa05e21e60
								
							
								
							
						 | 
						
							
							
								
								文章简要内容拼接...
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6d0f3788c7
								
							
								
							
						 | 
						
							
							
								
								resi-partymember:新增party_branch_members,partymember_auth_record
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1309a43973
								
							
								
							
						 | 
						
							
							
								
								gov-org新增党支部信息,代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								551b535f0c
								
							
								
							
						 | 
						
							
							
								
								党建声音部署-标签初始化代码及标签kredis key调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ac0b0a02ba
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								75d5d7ae43
								
							
								
							
						 | 
						
							
							
								
								1.增加网格维度初始化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6be724ba2c
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bd4f558ed4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d698569ce4
								
							
								
							
						 | 
						
							
							
								
								标签key统一到redisKeys中
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								dfa7e3d7b2
								
							
								
							
						 | 
						
							
							
								
								1.DimController重命名
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								197d73e31f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								297a136e84
								
							
								
							
						 | 
						
							
							
								
								1.按日维度初始化完成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								345364d980
								
							
								
							
						 | 
						
							
							
								
								sql调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bf112a712f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								62bb828309
								
							
								
							
						 | 
						
							
							
								
								1.修改注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9c580dff2c
								
							
								
							
						 | 
						
							
							
								
								添加机关、日维度表查询共用方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ba9eb180f9
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								df6aedf068
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								124ddd543d
								
							
								
							
						 | 
						
							
							
								
								1.增加线程池配置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a93c84d36a
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d071cc3d08
								
							
								
							
						 | 
						
							
							
								
								添加数据库标签初始化/重新加载到redis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2d8a4ad3d0
								
							
								
							
						 | 
						
							
							
								
								数据服务添加项目统计表代码生成文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								bb06390043
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								52b95b6c7f
								
							
								
							
						 | 
						
							
							
								
								数据维度mapper.xml
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c74c526a17
								
							
								
							
						 | 
						
							
							
								
								数据服务添加项目数据源
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								16cd78c0e2
								
							
								
							
						 | 
						
							
							
								
								数据维度相关文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b24077c6c6
								
							
								
							
						 | 
						
							
							
								
								1.版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fb7fe32b92
								
							
								
							
						 | 
						
							
							
								
								1.关闭dev环境的flyway
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d317dc7cf2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7e5b5afb4e
								
							
								
							
						 | 
						
							
							
								
								1.统计服务结构调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9e97c4b53a
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								329748ec57
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9e9b6972bf
								
							
								
							
						 | 
						
							
							
								
								geteway URL
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f7502b17ce
								
							
								
							
						 | 
						
							
							
								
								文章列表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4637d28c9b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b9f7c01da7
								
							
								
							
						 | 
						
							
							
								
								文章列表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4b5702ad7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d6d469be93
								
							
								
							
						 | 
						
							
							
								
								1.统计服务初步完成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								58653b7290
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								20806955fa
								
							
								
							
						 | 
						
							
							
								
								1.统计服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4fcaed1fa9
								
							
								
							
						 | 
						
							
							
								
								服务部署
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d7de48b395
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into release
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4ccbcab721
								
							
								
							
						 | 
						
							
							
								
								添加flyway脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4781bbeaf4
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f7d5064eda
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_voice' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9fb5c0db59
								
							
								
							
						 | 
						
							
							
								
								文章操作记录 添加下线网格Ids
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bb113c6897
								
							
								
							
						 | 
						
							
							
								
								版本号+1
							
							
							
							
								
							
							
						 | 
						5 years ago |