|  wxz | 5caa4850b8 | 补充因为合并代码导致的@Autowired丢失 | 5 years ago | 
				
					
						|  wxz | 89280a2d51 | Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data  Conflicts:
	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java | 5 years ago | 
				
					
						|  wxz | 1199124cce | 完成孔村议题大屏相关接口 | 5 years ago | 
				
					
						|  sunyuchao | 8179fcfcee | 孔村大屏-邻里党群部分接口 | 5 years ago | 
				
					
						|  yinzuomei | 9d06f21dbb | 孔村:删除screen_kc_user_heat_rank_grid_daily表 | 5 years ago | 
				
					
						|  yinzuomei | f1b15209cd | 18、邻里党群-小组详情 接口修改 v2 | 5 years ago | 
				
					
						|  yinzuomei | 0d3f4a5f29 | 18、邻里党群-小组详情 接口修改 | 5 years ago | 
				
					
						|  yinzuomei | 7848402d64 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  yinzuomei | 1813d6afa4 | 孔村采集api修改 | 5 years ago | 
				
					
						|  wxz | a116e61c91 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  wxz | d5ee8b7da8 | 新增:议题summary+议题趋势图 | 5 years ago | 
				
					
						|  jianjun | 38ece9f7bf | 去掉不该有的注解 | 5 years ago | 
				
					
						|  jianjun | 537fc4355d | 统计添加默认数据源 | 5 years ago | 
				
					
						|  jianjun | eee09a3a1b | 维度添加默认数据源 | 5 years ago | 
				
					
						|  jianjun | 07218d8e21 | 添加部分数据源注解 | 5 years ago | 
				
					
						|  sunyuchao | fea1a15f61 | 孔村大屏-公益互助部分接口 | 5 years ago | 
				
					
						|  wxz | 21f7d96164 | 动态数据源增加数据源名称日志 | 5 years ago | 
				
					
						|  wxz | 8b3436d429 | 动态数据源增加数据源名称日志 | 5 years ago | 
				
					
						|  yinzuomei | a7ebeffb70 | 孔村添加两个外部应用 | 5 years ago | 
				
					
						|  sunyuchao | 02a48a1965 | 孔村大屏接口 | 5 years ago | 
				
					
						|  zxc | 650736038c | 三大能力乘上对应权重,四舍五入提出公共方法 | 5 years ago | 
				
					
						|  sunyuchao | 8c0e505c4c | 名称修改 | 5 years ago | 
				
					
						|  sunyuchao | 80c0e6c2d2 | 孔村-首页-平台各类总数 | 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 | cbe689e1df | 修改错误 | 5 years ago | 
				
					
						|  wxz | b2d2567642 | 重新计算方法增加返回值 | 5 years ago | 
				
					
						|  jianjun | 406f3d20e9 | 修改错误 | 5 years ago | 
				
					
						|  jianjun | 0243c686cb | 部署消息通知排除本地的 | 5 years ago | 
				
					
						|  jianjun | 174358f68f | 批量归一算法 返回原始值 | 5 years ago | 
				
					
						|  jianjun | 8f507bbd35 | 批量归一算法 返回原始值 | 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 | 
				
					
						|  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 | 
				
					
						|  wangchao | caee1c7eb3 | 党员年龄分布,修改返回为NaN的情况 | 5 years ago | 
				
					
						|  wangchao | 51f7ebeb6a | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  zxc | 0bcdd40b77 | sql优化 | 5 years ago | 
				
					
						|  zhangyongzhangyong | d82f6bfb57 | 部门权重值 修改 | 5 years ago | 
				
					
						|  zhangyongzhangyong | 7b95a70e46 | 赋默认值 | 5 years ago | 
				
					
						|  zhangyongzhangyong | fac7c50e55 | 部门 权重值特殊处理 | 5 years ago | 
				
					
						|  jianjun | 5824179dd1 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  jianjun | c5e2a42abd | 添加权重 | 5 years ago | 
				
					
						|  zhangyongzhangyong | b815c55569 | 撤销 | 5 years ago | 
				
					
						|  jianjun | 252bb39088 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago |