`fix 单位`

ruoyi-admin/src/main/resources/application.yml

@@ -167,7 +167,7 @@ mybatis-plus:
     banner: true
     dbConfig:
       # 主键类型
-      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
+      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUI 唯一 UUIDD
       idType: ASSIGN_ID
       # 逻辑已删除值
       logicDeleteValue: 2

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblUnitController.java

@@ -44,8 +44,9 @@ public class TblUnitController extends BaseController {
      */
     @SaCheckPermission("data:unit:list")
     @GetMapping("/list")
-    public TableDataInfo<TblUnitVo> list(TblUnitBo bo, PageQuery pageQuery) {
-        return iTblUnitService.queryPageList(bo, pageQuery);
+    public R<?> list(TblUnitBo bo) {
+
+        return  R.ok(iTblUnitService.queryList(bo));
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblUnit.java

@@ -25,56 +25,56 @@ public class TblUnit extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
-    @TableId(value = "id")
+    @TableId
     private Long id;
     /**
-     * 
+     *
      */
     private String name;
     /**
-     * 
+     *
      */
     private String unitSymbol;
     /**
-     * 
+     *
      */
     private String unitName;
     /**
-     * 
+     *
      */
     private String isStandard;
     /**
-     * 
+     *
      */
     private String unitType;
     /**
-     * 
+     *
      */
     private Long toStandardRatio;
     /**
-     * 
+     *
      */
     private Long toOffset;
     /**
-     * 
+     *
      */
     private String remark;
     /**
-     * 
+     *
      */
     private String creator;
     /**
-     * 
+     *
      */
     private Date ctime;
     /**
-     * 
+     *
      */
     private String modifier;
     /**
-     * 
+     *
      */
     private Date utime;
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblUnitBo.java

@@ -1,16 +1,22 @@
 package com.ruoyi.data.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Value;
+import org.springframework.boot.context.properties.bind.DefaultValue;
+import org.springframework.integration.annotation.Default;
 
 /**
  * 单位业务对象 tbl_unit
@@ -24,81 +30,56 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblUnitBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitSymbol;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitName;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isStandard;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitType;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long toStandardRatio;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long toOffset;
 
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblUnitServiceImpl.java

@@ -19,6 +19,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Collection;
 
+import static cn.hutool.core.lang.Validator.UUID;
+
 /**
  * 单位Service业务层处理
  *