diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java index 5142515..e637f75 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java @@ -213,7 +213,7 @@ public class SurvHisdataLivestockwater implements Serializable { /** * 数据类型 */ - @TableField("DATA_TYPE") + @TableField("data_type") private String dataType; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java index b16385a..a49f1bd 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java @@ -145,7 +145,7 @@ public class SurvHisdataOrientwater implements Serializable { @ApiModelProperty(value = "2#球阀状态") private String secondValveStatus; /**3#球阀状态 */ - @TableField("THIRD_VALVE_STATUS") + @TableField("third_valve_status") private String thirdValveStatus; /**急停状态*/ @Excel(name = "急停状态", width = 15) @@ -214,6 +214,6 @@ public class SurvHisdataOrientwater implements Serializable { /** * 数据类型 */ - @TableField("DATA_TYPE") + @TableField("data_type") private String dataType; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java index 346c913..ab99589 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotVirtualDeviceModule.java @@ -113,7 +113,7 @@ public class SurvIotVirtualDeviceModule implements Serializable { /**模块配置*/ @Excel(name = "模块配置", width = 15) @ApiModelProperty(value = "模块配置") - @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "MODULE_PATH") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "module_path") private JSONObject modulePath; diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java index ee8e7de..dca487c 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java @@ -146,7 +146,7 @@ public class SurvTransdataLivestockwater implements Serializable { @ApiModelProperty(value = "2#球阀状态") private String secondValveStatus; /**3#球阀状态 */ - @TableField("THIRD_VALVE_STATUS") + @TableField("third_valve_status") private String thirdValveStatus; /**急停状态*/ @Excel(name = "急停状态", width = 15) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataSoilVo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataSoilVo.java index fb580e5..6b1b937 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataSoilVo.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataSoilVo.java @@ -97,21 +97,21 @@ public class SurvTransdataSoilVo implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION") + @TableField("data_soil_nion") private String dataSoilNion; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION") + @TableField("data_soil_pion") private String dataSoilPion; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION") + @TableField("data_soil_kion") private String dataSoilKion; @@ -120,21 +120,21 @@ public class SurvTransdataSoilVo implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION2") + @TableField("data_soil_nion2") private String dataSoilNion2; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION2") + @TableField("data_soil_pion2") private String dataSoilPion2; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION2") + @TableField("data_soil_kion2") private String dataSoilKion2; @@ -142,21 +142,21 @@ public class SurvTransdataSoilVo implements Serializable { * 氮离子 */ @Excel(name = "氮离子", width = 15) - @TableField("DATA_SOIL_NION3") + @TableField("data_soil_nion3") private String dataSoilNion3; /** * 磷离子 */ @Excel(name = "磷离子", width = 15) - @TableField("DATA_SOIL_PION3") + @TableField("data_soil_pion3") private String dataSoilPion3; /** * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION3") + @TableField("data_soil_kion3") private String dataSoilKion3; @@ -178,66 +178,66 @@ public class SurvTransdataSoilVo implements Serializable { * 钾离子 */ @Excel(name = "钾离子", width = 15) - @TableField("DATA_SOIL_KION4") + @TableField("data_soil_kion4") private String dataSoilKion4; /** * 土壤铵离子 */ @Excel(name = "土壤铵离子", width = 15) - @TableField("DATA_SOIL_NHION") + @TableField("data_soil_nhion") private String dataSoilNhion; /** * 土壤硝酸根离子 */ @Excel(name = "土壤硝酸根离子", width = 15) - @TableField("DATA_SOIL_NOION") + @TableField("data_soil_noion") private String dataSoilNoion; /** * 土壤铜离子 */ @Excel(name = "土壤铜离子", width = 15) - @TableField("DATA_SOIL_CUION") + @TableField("data_soil_cuion") private String dataSoilCuion; /** * 土壤铅离子 */ @Excel(name = "土壤铅离子", width = 15) - @TableField("DATA_SOIL_PBION") + @TableField("data_soil_pbion") private String dataSoilPbion; /** * 土壤镉离子 */ @Excel(name = "土壤镉离子", width = 15) - @TableField("DATA_SOIL_CDION") + @TableField("data_soil_cdion") private String dataSoilCdion; /**ph*/ @Excel(name = "ph", width = 15) - @TableField(value = "DATA_WATER_PH") + @TableField(value = "data_water_ph") private String dataWaterPh; /**电导率*/ - @TableField(value = "DATA_WATER_DDL") + @TableField(value = "data_water_ddl") private String dataWaterDdl; /**水温*/ - @TableField(value = "DATA_WATER_TEMP") + @TableField(value = "data_water_temp") private String dataWaterTemp; /**浊度*/ - @TableField(value = "DATA_WATER_NTU") + @TableField(value = "data_water_ntu") private String dataWaterNtu; /**溶解氧*/ - @TableField(value = "DATA_WATER_DO") + @TableField(value = "data_water_do") private String dataWaterDo; /**数据更新时间*/