diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java index 1a3880ad..e838fb8c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java @@ -17,7 +17,7 @@ public class ModelPestDiseaseWeedPageReqVO extends PageParam { private String cycleId; @Schema(description = "病虫草害类型", example = "2") - private Integer type; + private String type; @Schema(description = "病虫草害名称", example = "芋艿") private String name; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java index e095b058..9312a2b9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java @@ -1,63 +1,63 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 模型管理-病虫草害 Response VO") -@Data -@ExcelIgnoreUnannotated -public class ModelPestDiseaseWeedRespVO { - - @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2957") - @ExcelProperty("基础id") - private String id; - - @Schema(description = "周期id", example = "11935") - @ExcelProperty("周期id") - private String cycleId; - - @Schema(description = "病虫草害类型", example = "2") - @ExcelProperty("病虫草害类型") - private Integer type; - - @Schema(description = "病虫草害名称", example = "芋艿") - @ExcelProperty("病虫草害名称") - private String name; - - @Schema(description = "病虫草害id", example = "20996") - @ExcelProperty("病虫草害id") - private String pestsId; - - @Schema(description = "预警摘要说明", example = "你说的对") - @ExcelProperty("预警摘要说明") - private String description; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "基地id", example = "22440") - @ExcelProperty("基地id") - private String baseId; - - @Schema(description = "基地", example = "张三") - @ExcelProperty("基地") - private String baseName; - - @Schema(description = "地块ID", example = "17998") - @ExcelProperty("地块ID") - private String plotId; - - @Schema(description = "地块", example = "赵六") - @ExcelProperty("地块") - private String plotName; - - @Schema(description = "租户id", example = "31930") - @ExcelProperty("租户id") - private String tenantId; - -} \ No newline at end of file +package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 模型管理-病虫草害 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ModelPestDiseaseWeedRespVO { + + @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2957") + @ExcelProperty("基础id") + private String id; + + @Schema(description = "周期id", example = "11935") + @ExcelProperty("周期id") + private String cycleId; + + @Schema(description = "病虫草害类型", example = "2") + @ExcelProperty("病虫草害类型") + private String type; + + @Schema(description = "病虫草害名称", example = "芋艿") + @ExcelProperty("病虫草害名称") + private String name; + + @Schema(description = "病虫草害id", example = "20996") + @ExcelProperty("病虫草害id") + private String pestsId; + + @Schema(description = "预警摘要说明", example = "你说的对") + @ExcelProperty("预警摘要说明") + private String description; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "基地id", example = "22440") + @ExcelProperty("基地id") + private String baseId; + + @Schema(description = "基地", example = "张三") + @ExcelProperty("基地") + private String baseName; + + @Schema(description = "地块ID", example = "17998") + @ExcelProperty("地块ID") + private String plotId; + + @Schema(description = "地块", example = "赵六") + @ExcelProperty("地块") + private String plotName; + + @Schema(description = "租户id", example = "31930") + @ExcelProperty("租户id") + private String tenantId; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java index a3f71171..c93e6666 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java @@ -14,7 +14,7 @@ public class ModelPestDiseaseWeedSaveReqVO { private String cycleId; @Schema(description = "病虫草害类型", example = "2") - private Integer type; + private String type; @Schema(description = "病虫草害名称", example = "芋艿") private String name; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java index 514692fd..bd2cc08d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java @@ -34,7 +34,7 @@ public class ModelPestDiseaseWeedDO extends BaseDO { /** * 病虫草害类型 */ - private Integer type; + private String type; /** * 病虫草害名称 */