Merge remote-tracking branch 'origin/6170' into 6170

# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -1,9 +1,6 @@
 package com.fuyuanshen.equipment.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,6 +29,13 @@ public class Device extends TenantEntity {
     @TableField(exist = false)
     private Long assignId;
 
+    /**
+     * 设备分组
+     * group_id
+     */
+    @Schema(name = "设备分组")
+    private Long groupId;
+
     /**
      * device_type
      */
@@ -143,4 +147,11 @@ public class Device extends TenantEntity {
      */
     private String subTopic;
 
+    /**
+     * 出厂日期
+     * production_date
+     */
+    @Schema(name = "出厂日期")
+    private Date productionDate;
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java

@@ -30,18 +30,21 @@ public class DeviceGroupBo extends BaseEntity {
     /**
      * 分组名称
      */
+    @Schema(name = "分组名称")
     @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String groupName;
 
     /**
      * 状态：0-禁用，1-正常
      */
+    @Schema(name = "状态：0-禁用，1-正常")
     // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**
      * 父分组ID
      */
+    @Schema(name = "父分组ID")
     private Long parentId;
 
     /**

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -66,14 +66,28 @@ public class DeviceQueryCriteria extends BaseEntity {
     /* app绑定用户id */
     private Long bindingUserId;
 
+
     /**
      * 使用人员
      */
     private String personnelBy;
 
-    /* 是否为管理员 */
+    /**
+     * 是否为管理员
+     */
+    @Schema(name = "是否为管理员")
     private Boolean isAdmin = false;
 
+    /**
+     * 设备所属分组
+     */
+    @Schema(name = "设备所属分组")
+    private Long groupId;
 
+    /**
+     * 设备地区
+     */
+    @Schema(name = "设备地区")
+    private String area;
 
 }