Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -35,11 +35,11 @@ public class WaterResourceDto extends BaseDto {
 
 
     @ApiModelProperty(value = "经度")
-    @ExcelProperty(value = "经度", index = 48)
+    @ExcelProperty(value = "经度", index = 44)
     private Double longitude;
 
     @ApiModelProperty(value = "纬度")
-    @ExcelProperty(value = "纬度", index = 49)
+    @ExcelProperty(value = "纬度", index = 45)
     private Double latitude;
 
     @ExcelIgnore