查询列表使用原始

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataSoil.java

@@ -235,7 +235,6 @@ public class SurvHisdataSoil implements Serializable {
     @Excel(name = "土壤铅离子", width = 15)
     @TableField("data_soil_pbion")
     private String dataSoilPbion;
-
     /**
      * 土壤镉离子
      */
@@ -243,27 +242,27 @@ public class SurvHisdataSoil implements Serializable {
     @TableField("data_soil_cdion")
     private String dataSoilCdion;
 
-
-
     /**ph*/
     @Excel(name = "ph", width = 15)
     @TableField(value = "data_water_ph")
     private String dataWaterPh;
-
-
     /**电导率*/
+    @Excel(name = "电导率", width = 15)
     @TableField(value = "data_water_ddl")
     private String dataWaterDdl;
 
     /**水温*/
+    @Excel(name = "水温", width = 15)
     @TableField(value = "data_water_temp")
     private String dataWaterTemp;
 
     /**浊度*/
+    @Excel(name = "浊度", width = 15)
     @TableField(value = "data_water_ntu")
     private String dataWaterNtu;
 
     /**溶解氧*/
+    @Excel(name = "溶解氧", width = 15)
     @TableField(value = "data_water_do")
     private String dataWaterDo;
 
@@ -273,18 +272,22 @@ public class SurvHisdataSoil implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "数据更新时间")
     private Date dataDateTime;
+
 	/**数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据*/
 	@Excel(name = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15)
     @ApiModelProperty(value = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据")
     private String dataGatherType;
+
 	/**站点ID*/
 	@Excel(name = "站点ID", width = 15)
     @ApiModelProperty(value = "站点ID")
     private String stationId;
+
 	/**设备ID*/
 	@Excel(name = "设备ID", width = 15)
     @ApiModelProperty(value = "设备ID")
     private String deviceId;
+
 	/**站点编号*/
 	@Excel(name = "站点编号", width = 15)
     @ApiModelProperty(value = "站点编号")