资源保管人

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java

@@ -2,12 +2,12 @@ package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
 import cn.iocoder.yudao.module.system.dict.Dict;
 import com.alibaba.fastjson.JSONArray;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -24,6 +24,9 @@ public class ResourceBaseVO {
     @ApiModelProperty(value = "")
     private String name;
 
+    @ApiModelProperty(value = "保管人id")
+    private Long custodianId;
+
     @ApiModelProperty(value = "")
     private String content;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONArray;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import java.util.Date;
 
 /**
  * 农场资源 Excel VO
@@ -24,6 +24,9 @@ public class ResourceExcelVO {
     @ExcelProperty("")
     private String name;
 
+    @ApiModelProperty(value = "保管人id")
+    private Long custodianId;
+
     @ExcelProperty("")
     private String content;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
 import com.alibaba.fastjson.JSONArray;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel(value = "管理后台 - 农场资源 Excel 导出 Request VO", description = "参数和 ResourcePageReqVO 是一致的")
@@ -19,6 +20,9 @@ public class ResourceExportReqVO {
     @ApiModelProperty(value = "")
     private String name;
 
+    @ApiModelProperty(value = "保管人id")
+    private Long custodianId;
+
     @ApiModelProperty(value = "")
     private String content;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java

@@ -1,12 +1,16 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
-import com.alibaba.fastjson.JSONArray;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("管理后台 - 农场资源分页 Request VO")
@@ -21,6 +25,9 @@ public class ResourcePageReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private String name;
 
+    @ApiModelProperty(value = "保管人id")
+    private Long custodianId;
+
     @ApiModelProperty(value = "")
     private String content;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java

@@ -1,14 +1,15 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.resource;
 
-import cn.iocoder.yudao.module.system.dict.Dict;
-import cn.iocoder.yudao.module.system.dict.DictAspect;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+import java.util.Date;
 
 /**
  * 农场资源 DO
@@ -37,6 +38,11 @@ public class ResourceDO extends BaseDO {
      * 
      */
     private String name;
+
+    /**
+     * 保管人
+     */
+    private Long custodianId;
     /**
      * 
      */