gongtianyi
							
						 
					 | 
					
						
						
							
						
						fb972249dc
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-06-25 10:10:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gongtianyi
							
						 
					 | 
					
						
						
							
						
						e29636522d
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-06-20 16:22:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								18536819133
							
						 
					 | 
					
						
						
							
						
						4dd8ed7a0d
					 | 
					
						
						
							
							提交专题报告年
						
						
						
						
						
						
					 | 
					
						2023-10-21 13:34:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								18536819133
							
						 
					 | 
					
						
						
							
						
						34bf6a2580
					 | 
					
						
						
							
							提交专题报告年
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:14:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								18536819133
							
						 
					 | 
					
						
						
							
						
						e9a3ad8dc2
					 | 
					
						
						
							
							修改配置
						
						
						
						
						
						
					 | 
					
						2023-10-20 16:48:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								18536819133
							
						 
					 | 
					
						
						
							
						
						b9c6dec44f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev_sjs'
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml 
						
						
					 | 
					
						2023-10-20 16:46:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								18536819133
							
						 
					 | 
					
						
						
							
						
						4af1c07029
					 | 
					
						
						
							
							修改配置
						
						
						
						
						
						
					 | 
					
						2023-10-20 16:25:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b0e7b2096d
					 | 
					
						
						
							
							城市不透水面修改
						
						
						
						
						
						
					 | 
					
						2023-04-24 14:08:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2bf70cf2a
					 | 
					
						
						
							
							各国、各省省平均EQI分布折线图
						
						
						
						
						
						
					 | 
					
						2023-03-15 17:57:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9158979599
					 | 
					
						
						
							
							ENSO修改
						
						
						
						
						
						
					 | 
					
						2023-03-06 17:28:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d6a411e858
					 | 
					
						
						
							
							ENSO影响监测
						
						
						
						
						
						
					 | 
					
						2023-02-28 14:49:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41ad8eebc3
					 | 
					
						
						
							
							大气质量监测模块修改
						
						
						
						
						
						
					 | 
					
						2023-02-27 11:59:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d27dad982b
					 | 
					
						
						
							
							亚大综合监测、森林监测添加柬埔寨各省数据
						
						
						
						
						
						
					 | 
					
						2023-02-21 15:02:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef66a3ff00
					 | 
					
						
						
							
							数据流动年份
						
						
						
						
						
						
					 | 
					
						2022-12-07 17:16:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						448aa856e9
					 | 
					
						
						
							
							国家查询优化
						
						
						
						
						
						
					 | 
					
						2022-11-10 15:24:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d7c0dafd1
					 | 
					
						
						
							
							ENSO事件影响监测
						
						
						
						
						
						
					 | 
					
						2022-11-10 10:30:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96f4881285
					 | 
					
						
						
							
							综合监测模块字段修改
						
						
						
						
						
						
					 | 
					
						2022-11-09 15:25:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53b00a7d28
					 | 
					
						
						
							
							综合监测
						
						
						
						
						
						
					 | 
					
						2022-11-08 16:40:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25897b41d8
					 | 
					
						
						
							
							修改月份字段
						
						
						
						
						
						
					 | 
					
						2022-11-07 16:43:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3fd09cc44a
					 | 
					
						
						
							
							修改配置
						
						
						
						
						
						
					 | 
					
						2022-11-03 13:55:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53fb8da5c1
					 | 
					
						
						
							
							PM2.5
						
						
						
						
						
						
					 | 
					
						2022-11-03 09:54:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da51b2a55d
					 | 
					
						
						
							
							修改森林检测模块
						
						
						
						
						
						
					 | 
					
						2022-11-01 18:00:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aab12640b0
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2022-11-01 15:29:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						382d9018e8
					 | 
					
						
						
							
							修改格式,修改森林数据
						
						
						
						
						
						
					 | 
					
						2022-11-01 15:28:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						854afa033d
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-08-16 08:36:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						52095ccd04
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2022-07-14 15:00:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						e348a10862
					 | 
					
						
						
							
							不透水面修改
						
						
						
						
						
						
					 | 
					
						2022-07-12 16:31:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						2a64885193
					 | 
					
						
						
							
							修改参数
						
						
						
						
						
						
					 | 
					
						2022-07-08 14:46:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						7943dd8156
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2022-07-01 16:10:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						b94ce7f31b
					 | 
					
						
						
							
							新增1不透水面信息,扩张方位
						
						
						
						
						
						
					 | 
					
						2022-07-01 14:26:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						9665ec2690
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2022-07-01 11:05:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						9c144e2138
					 | 
					
						
						
							
							新增城市模块
						
						
						
						
						
						
					 | 
					
						2022-07-01 11:04:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						b8d90525ae
					 | 
					
						
						
							
							地图服务
						
						
						
						
						
						
					 | 
					
						2022-06-30 16:06:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						b51521dac7
					 | 
					
						
						
							
							修改mapper
						
						
						
						
						
						
					 | 
					
						2022-06-28 11:58:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						f52a876226
					 | 
					
						
						
							
							修改控制器及新增城市功能
						
						
						
						
						
						
					 | 
					
						2022-06-24 10:28:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						11b8a3db44
					 | 
					
						
						
							
							Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
#	ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
#	ruoyi-ui/src/views/tool/swagger/index.vue 
						
						
					 | 
					
						2022-06-22 15:53:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						8918116dbd
					 | 
					
						
						
							
							测试
						
						
						
						
						
						
					 | 
					
						2022-06-22 15:43:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						43ee95a198
					 | 
					
						
						
							
							修改查询方法,增加查询条件
						
						
						
						
						
						
					 | 
					
						2022-06-20 17:06:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qdxkrs
							
						 
					 | 
					
						
						
							
						
						7c5e92246f
					 | 
					
						
						
							
							升级依赖包
						
						
						
						
						
						
					 | 
					
						2022-06-16 14:13:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qdxkrs
							
						 
					 | 
					
						
						
							
						
						6148ca9ae8
					 | 
					
						
						
							
							修改滑动验证码
						
						
						
						
						
						
					 | 
					
						2022-06-16 10:50:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						3006b3c751
					 | 
					
						
						
							
							增加redis密码
						
						
						
						
						
						
					 | 
					
						2022-06-16 09:49:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						e9e8ea36b7
					 | 
					
						
						
							
							验证码修改
						
						
						
						
						
						
					 | 
					
						2022-06-16 09:49:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						c9ee01dd1f
					 | 
					
						
						
							
							验证码
						
						
						
						
						
						
					 | 
					
						2022-06-16 09:24:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						2de946adb8
					 | 
					
						
						
							
							增加各个数据表数据上床功能,切换数据库
						
						
						
						
						
						
					 | 
					
						2022-06-08 17:18:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						a4976eff13
					 | 
					
						
						
							
							修改字典和token过期时间
						
						
						
						
						
						
					 | 
					
						2022-05-31 10:47:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						42e4acf3dd
					 | 
					
						
						
							
							新增字典功能
						
						
						
						
						
						
					 | 
					
						2022-05-30 10:11:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qdxkrs
							
						 
					 | 
					
						
						
							
						
						498a502c02
					 | 
					
						
						
							
							添加swagger 新界面
						
						
						
						
						
						
					 | 
					
						2022-05-24 12:01:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						264a5d910f
					 | 
					
						
						
							
							修改接口
						
						
						
						
						
						
					 | 
					
						2022-05-24 11:29:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						5041f3f92f
					 | 
					
						
						
							
							注解修改
						
						
						
						
						
						
					 | 
					
						2022-05-23 14:17:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						f4caf10bd3
					 | 
					
						
						
							
							合并更新
						
						
						
						
						
						
					 | 
					
						2022-05-23 09:49:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |