zxc
							
						 | 
						
							
							
							
								
							
								892cde7e54
								
							
								
							
						 | 
						
							
							
								
								添加注解 @DataSource
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d199f6e3f9
								
							
								
							
						 | 
						
							
							
								
								大屏数据采集和指标采集  接口增加注解
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8f26509c8e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4cb3ae5f54
								
							
								
							
						 | 
						
							
							
								
								组织树修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8c2d50b4e6
								
							
								
							
						 | 
						
							
							
								
								初始化客户指标
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4b96b20357
								
							
								
							
						 | 
						
							
							
								
								增加外部应用相关的表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								0825b50183
								
							
								
							
						 | 
						
							
							
								
								11、基层治理-公众参与 接口:增长率计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7367601fb7
								
							
								
							
						 | 
						
							
							
								
								data-report增加动态数据源demo(projectDetail)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								380e472501
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2f029dc8e3
								
							
								
							
						 | 
						
							
							
								
								动态数据源—增加data-report服务的数据源枚举
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f5b1bf2a2b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f9e1a07e7c
								
							
								
							
						 | 
						
							
							
								
								动态数据源-支持参数方式指定数据源
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								74b76f67a5
								
							
								
							
						 | 
						
							
							
								
								大屏数据采集api  接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								55dcd6f89b
								
							
								
							
						 | 
						
							
							
								
								大屏数据接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								5ca662f684
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7fbda69ed6
								
							
								
							
						 | 
						
							
							
								
								大屏数据接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								60a45cbc1e
								
							
								
							
						 | 
						
							
							
								
								detail修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								16864081cd
								
							
								
							
						 | 
						
							
							
								
								外部客户管理-列表分页、新增、修改接口返回的id改为customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6626ce3a11
								
							
								
							
						 | 
						
							
							
								
								screen_pioneer_data表查询data_end_time添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2169d5c876
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								193e3ae535
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								183932f995
								
							
								
							
						 | 
						
							
							
								
								动态数据源-支持方法入参级别的设置
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								271f1b0536
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								01603bb5ed
								
							
								
							
						 | 
						
							
							
								
								下级部门指数排行修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1f45d782a7
								
							
								
							
						 | 
						
							
							
								
								将评价指标体系excel导入数据库
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9957f8d81b
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								57994420ba
								
							
								
							
						 | 
						
							
							
								
								修改screen_相关表v3
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8804a17961
								
							
								
							
						 | 
						
							
							
								
								修改screen_相关表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								77dee4155d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d7d292f66
								
							
								
							
						 | 
						
							
							
								
								screen_相关表修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c22f2a76c8
								
							
								
							
						 | 
						
							
							
								
								getXPro
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								453df054ec
								
							
								
							
						 | 
						
							
							
								
								获取月份时间轴优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								28a9535125
								
							
								
							
						 | 
						
							
							
								
								先锋模范优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a013f2bfbd
								
							
								
							
						 | 
						
							
							
								
								打开dev的nacos注册
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								320a9dbc4c
								
							
								
							
						 | 
						
							
							
								
								完成应用维护
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								00d0973829
								
							
								
							
						 | 
						
							
							
								
								完成外部客户维护
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ae17f56fe4
								
							
								
							
						 | 
						
							
							
								
								1、先锋模范
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								57d76e6486
								
							
								
							
						 | 
						
							
							
								
								10、党建引领-先锋模范数据  接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								d2c2a85705
								
							
								
							
						 | 
						
							
							
								
								指数采集接口修改-end
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dd2c58fba5
								
							
								
							
						 | 
						
							
							
								
								基层治理接口  1~4
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c6daa8fff3
								
							
								
							
						 | 
						
							
							
								
								3、党员志愿服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								93af81cee3
								
							
								
							
						 | 
						
							
							
								
								2、党员联系群众
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ed1c7caacf
								
							
								
							
						 | 
						
							
							
								
								2、党员联系群众
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								57909e4ba3
								
							
								
							
						 | 
						
							
							
								
								指数采集 接口开发
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bea1873c14
								
							
								
							
						 | 
						
							
							
								
								4、下级部门指数排行,3、月度指数分析-柱状图
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								6ea8436111
								
							
								
							
						 | 
						
							
							
								
								党建能力 - 接口入参定义
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								c34fffb228
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								4beaeacfcb
								
							
								
							
						 | 
						
							
							
								
								getX()修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								56e454e1e2
								
							
								
							
						 | 
						
							
							
								
								指标采集相关代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								03445db264
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
							
							
							
							
								
							
							
						 | 
						5 years ago |