jianjun
							
						 | 
						
							
							
							
								
							
								6e0fa501d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								eee09a3a1b
								
							
								
							
						 | 
						
							
							
								
								维度添加默认数据源
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4010a0a7ce
								
							
								
							
						 | 
						
							
							
								
								添加部分数据源注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cd6a510d22
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								07218d8e21
								
							
								
							
						 | 
						
							
							
								
								添加部分数据源注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fea1a15f61
								
							
								
							
						 | 
						
							
							
								
								孔村大屏-公益互助部分接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								455ca08223
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4d520acd1e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								21f7d96164
								
							
								
							
						 | 
						
							
							
								
								动态数据源增加数据源名称日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8b3436d429
								
							
								
							
						 | 
						
							
							
								
								动态数据源增加数据源名称日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								897429dc77
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a7ebeffb70
								
							
								
							
						 | 
						
							
							
								
								孔村添加两个外部应用
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								02a48a1965
								
							
								
							
						 | 
						
							
							
								
								孔村大屏接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a2636ce785
								
							
								
							
						 | 
						
							
							
								
								partymember 升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a34f1ea105
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d867bee4be
								
							
								
							
						 | 
						
							
							
								
								党员认证bug修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								eb5428b478
								
							
								
							
						 | 
						
							
							
								
								升级report
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3cee9dd521
								
							
								
							
						 | 
						
							
							
								
								升级stais
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7e88f8c7ec
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								650736038c
								
							
								
							
						 | 
						
							
							
								
								三大能力乘上对应权重,四舍五入提出公共方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8c0e505c4c
								
							
								
							
						 | 
						
							
							
								
								名称修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								80c0e6c2d2
								
							
								
							
						 | 
						
							
							
								
								孔村-首页-平台各类总数
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								006e37613b
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cb59584cdf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8c18b0b7dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bfa0bca476
								
							
								
							
						 | 
						
							
							
								
								增加暂停的统计,重新处理
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c60bf56070
								
							
								
							
						 | 
						
							
							
								
								sql修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cd038cf355
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d2e1c7cb6
								
							
								
							
						 | 
						
							
							
								
								/data/stats/kcscreencoll/news/trend 接口入参去掉readCount,screen_kc_news_trend_monthly表去掉read_count
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d977aaaddb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cbe689e1df
								
							
								
							
						 | 
						
							
							
								
								修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ce31736b68
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								aee8a07596
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b2d2567642
								
							
								
							
						 | 
						
							
							
								
								重新计算方法增加返回值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cbe0c0679b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								406f3d20e9
								
							
								
							
						 | 
						
							
							
								
								修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0a943ff69c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0243c686cb
								
							
								
							
						 | 
						
							
							
								
								部署消息通知排除本地的
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								69f3b206e7
								
							
								
							
						 | 
						
							
							
								
								升级statis
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6df7724c0e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								174358f68f
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8f507bbd35
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4ee303f7bd
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								634d8976b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ddc31fb121
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								fd0ffe0a4c
								
							
								
							
						 | 
						
							
							
								
								指数 - 年表,计算,乘以权重
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b4254b09f9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2595269922
								
							
								
							
						 | 
						
							
							
								
								新增:数据统计-重新执行所有pendding中的计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d5b1c5a225
								
							
								
							
						 | 
						
							
							
								
								批量归一算法 返回原始值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2c4b5c7dd1
								
							
								
							
						 | 
						
							
							
								
								指标优化
							
							
							
							
								
							
							
						 | 
						5 years ago |