wxz
							
						 | 
						
							
							
							
								
							
								4b96b20357
								
							
								
							
						 | 
						
							
							
								
								增加外部应用相关的表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f2bfdd2fbe
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								040d28bd01
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5ac5785351
								
							
								
							
						 | 
						
							
							
								
								BUG修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								0825b50183
								
							
								
							
						 | 
						
							
							
								
								11、基层治理-公众参与 接口:增长率计算
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								93ff9acbc1
								
							
								
							
						 | 
						
							
							
								
								BUG修改 服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								af13635d34
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0a1d3e7197
								
							
								
							
						 | 
						
							
							
								
								BUG修改
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								935a1296ef
								
							
								
							
						 | 
						
							
							
								
								ext   govorg user  +1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								74b76f67a5
								
							
								
							
						 | 
						
							
							
								
								大屏数据采集api  接口调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7a0246de40
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								2c92c49c23
								
							
								
							
						 | 
						
							
							
								
								ext接口加上userId返参
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								b2da66884f
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f0192e1c81
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_externalappauth' into dev_temp
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								703a591ab4
								
							
								
							
						 | 
						
							
							
								
								third升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8dbb6f926b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								92b184303a
								
							
								
							
						 | 
						
							
							
								
								oper-customize升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								fde4114ca1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e368e19ff2
								
							
								
							
						 | 
						
							
							
								
								设置业务域名修改
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fa100a283f
								
							
								
							
						 | 
						
							
							
								
								默认功能保存、客户初始化新的默认功能
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a3f408cb40
								
							
								
							
						 | 
						
							
							
								
								oper-customize升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6e0b137efb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f9a85d2a9a
								
							
								
							
						 | 
						
							
							
								
								设置业务域名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2596b5eef4
								
							
								
							
						 | 
						
							
							
								
								设置服务器域名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c22f2a76c8
								
							
								
							
						 | 
						
							
							
								
								getXPro
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								453df054ec
								
							
								
							
						 | 
						
							
							
								
								获取月份时间轴优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								aa0a2a5cba
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								daed29d066
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_plugins' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |