From 0174e14455823c30b4895a7b6a85c9dbb10e5d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Mon, 30 May 2022 16:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../farm/controller/admin/project/vo/ProjectBaseVO.java      | 3 +++
 .../farm/controller/admin/project/vo/ProjectExcelVO.java     | 2 ++
 .../farm/controller/admin/project/vo/ProjectExportReqVO.java | 2 ++
 .../farm/controller/admin/project/vo/ProjectPageReqVO.java   | 2 ++
 .../controller/admin/project/vo/ProjectSearchPageReqVO.java  | 3 +++
 .../module/farm/controller/admin/task/vo/TaskBaseVO.java     | 4 ++++
 .../module/farm/controller/admin/task/vo/TaskExcelVO.java    | 4 ++++
 .../farm/controller/admin/task/vo/TaskExportReqVO.java       | 4 ++++
 .../module/farm/controller/admin/task/vo/TaskPageReqVO.java  | 4 ++++
 .../farm/controller/admin/task/vo/TaskPageSearchReqVO.java   | 4 ++++
 .../yudao/module/farm/dal/dataobject/project/ProjectDO.java  | 5 +++++
 .../yudao/module/farm/dal/dataobject/task/TaskDO.java        | 4 ++++
 12 files changed, 41 insertions(+)

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 98bd2768..46fa217f 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,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -31,6 +32,8 @@ public class ProjectBaseVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Object members;
+
     @ApiModelProperty(value = "")
     private String images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java
index 212f7437..43a6a8fc 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,6 +28,7 @@ public class ProjectExcelVO {
     private Integer state;
 
     private Object areas;
+    private Object members;
 
     private Integer cropId;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java
index 3478b4d5..ba822b4a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -26,6 +27,7 @@ public class ProjectExportReqVO {
 
     @ApiModelProperty(value = "")
     private Object resources;
+    private Object members;
 
     @ApiModelProperty(value = "")
     private String images;
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java
index bb48a1a8..ec385a27 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -23,6 +24,7 @@ public class ProjectPageReqVO extends PageParam {
     private Integer state;
 
     private Object areas;
+    private Object members;
 
     private Integer cropId;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java
index bb7f36f8..2f75333a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,8 @@ public class ProjectSearchPageReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private String resources;
 
+    private Object members;
+
     @ApiModelProperty(value = "")
     private String images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
index 12e0e090..7b2c6bd9 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
@@ -28,6 +28,10 @@ public class TaskBaseVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java
index 6ee06dc6..78b98340 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java
@@ -33,6 +33,10 @@ public class TaskExcelVO {
     @ExcelProperty("")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ExcelProperty("")
     private Object images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java
index 6c72327c..551c5c50 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java
@@ -25,6 +25,10 @@ public class TaskExportReqVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java
index 7a4eeb4d..e413e7bc 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java
@@ -27,6 +27,10 @@ public class TaskPageReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java
index 0132b9b9..97967da7 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java
@@ -32,6 +32,10 @@ public class TaskPageSearchReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private String resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object 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 df5974cf..1948a38d 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,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.project;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -41,6 +42,8 @@ public class ProjectDO extends BaseDO {
      * 
      */
     private Object resources;
+
+    private Object members;
     /**
      * 
      */
@@ -58,4 +61,6 @@ public class ProjectDO extends BaseDO {
      */
     private Integer weight;
 
+    private Integer tenantId;
+
 }
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
index d3cce2fa..fb762e9d 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
@@ -29,6 +29,10 @@ public class TaskDO extends BaseDO {
     private Integer cropId;
     private Integer cropNum;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     /**
      * 
      */