修改bug

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

@@ -151,7 +151,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "高度（cm）", index = 11)
 	@ApiModelProperty(value = "高度（cm）")
-	private Float height;
+	private float height;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "水源可用状态类别代码")
@@ -181,15 +181,15 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "管网直径（cm）", index = 16)
 	@ApiModelProperty(value = "管网直径（cm）")
-	private Float pipeDiameter;
+	private float pipeDiameter;
 
 	@ExcelProperty(value = "进水管直径(cm)", index = 17)
 	@ApiModelProperty(value = "进水管直径(cm)")
-	private Float inletPipeDiameter;
+	private float inletPipeDiameter;
 
 	@ExcelProperty(value = "出水管直径(cm)", index = 18)
 	@ApiModelProperty(value = "出水管直径(cm)")
-	private Float outletPipeDiameter;
+	private float outletPipeDiameter;
 
 	@ExcelProperty(value = "加水车道数量(个)", index = 19)
 	@ApiModelProperty(value = "加水车道数量(个)")
@@ -254,11 +254,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "容积（m³）", index = 28)
 	@ApiModelProperty(value = "容积（m³）")
-	private Float volume;
+	private float volume;
 
 	@ExcelProperty(value = "面积（㎡）", index = 29)
 	@ApiModelProperty(value = "面积（㎡）")
-	private Float area;
+	private float area;
 
 	@ExcelProperty(value = "水质情况", index = 30)
 	@ApiModelProperty(value = "水质情况")
@@ -285,11 +285,11 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "取水高度(cm)", index = 34)
 	@ApiModelProperty(value = "取水高度(cm)")
-	private Float intakeHeight;
+	private float intakeHeight;
 
 	@ExcelProperty(value = "水源标高差(cm)", index = 35)
 	@ApiModelProperty(value = "水源标高差(cm)")
-	private Float elevationDifference;
+	private float elevationDifference;
 
 	@ExcelProperty(value = "停车位置", index = 36)
 	@ApiModelProperty(value = "停车位置")
@@ -297,7 +297,7 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "停车数量(个)", index = 37)
 	@ApiModelProperty(value = "停车数量(个)")
-	private Integer parkingNum;
+	private int parkingNum;
 
 	// 物联参数改为动态加载，原先字段作废，字段做隐藏
 	@ExcelIgnore

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceHydrant.java

@@ -106,7 +106,7 @@ public class WaterResourceHydrant extends BaseEntity {
 	  * 官网直径（cm）
      */
 	@TableField("pipe_diameter")
-    private Float pipeDiameter;
+    private float pipeDiameter;
     /**
 	  * 供水单位名称
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceNatural.java

@@ -31,7 +31,7 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private Float height;
+    private float height;
     /**
 	  * 水源类型代码
      */
@@ -46,12 +46,12 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private Float volume;
+    private float volume;
     /**
 	  * 面积（㎡）
      */
 	@TableField("area")
-    private Float area;
+    private float area;
     /**
 	  * 水质情况
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -31,7 +31,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private Float volume;
+    private float volume;
     /**
 	  * 水源可用状态类别代码
      */
@@ -56,12 +56,12 @@ public class WaterResourcePool extends BaseEntity {
 	  * 取水高度(cm)
      */
 	@TableField("intake_height")
-    private Float intakeHeight;
+    private float intakeHeight;
     /**
 	  * 水源标高差(cm)
      */
 	@TableField("elevation_difference")
-    private Float elevationDifference;
+    private float elevationDifference;
     /**
 	  * 停车位置
      */
@@ -71,7 +71,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 停车数量(个)
      */
 	@TableField("parking_num")
-    private Integer parkingNum;
+    private int parkingNum;
     /**
 	  * 消防给水管网形式类型代码
      */