diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java index 46fa217f..adce6f8c 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo; import cn.hutool.json.JSON; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -25,14 +26,16 @@ public class ProjectBaseVO { @ApiModelProperty(value = "") private Integer state; - private Object areas; + @ApiModelProperty("父级区域") + private JSONArray areas; private Integer cropId; @ApiModelProperty(value = "") private Object resources; - private Object members; + @ApiModelProperty("成员选择") + private JSONArray members; @ApiModelProperty(value = "") private String images; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java index 1948a38d..f646f84a 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.project; -import cn.hutool.json.JSON; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.*; import java.util.*; import com.baomidou.mybatisplus.annotation.*; @@ -11,7 +13,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; * * @author 系统管理员 */ -@TableName("farm_project") +@TableName(value = "farm_project", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -35,15 +37,15 @@ public class ProjectDO extends BaseDO { private String content; private Integer state; - private Object areas; + @ApiModelProperty("父级区域") + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray areas; private Integer cropId; - /** - * - */ - private Object resources; - private Object members; + @ApiModelProperty("成员选择") + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray members; /** * */