From a2d00e3ab7d8933bf0dce67db4592400be6f645e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Thu, 2 Jun 2022 11:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/project/vo/ProjectBaseVO.java        |  7 +++++--
 .../farm/dal/dataobject/project/ProjectDO.java | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

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;
     /**
      * 
      */