瀏覽代碼

fix:修改继承的基类,新增校验条件

qingwudarao 6 月之前
父節點
當前提交
3ec1e18068

+ 3 - 2
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/BrandBo.java

@@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Brand;
-import org.dromara.common.tenant.core.TenantEntity;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 品牌业务对象
@@ -13,7 +13,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Brand.class, reverseConvertGenerate = false)
-public class BrandBo extends TenantEntity {
+public class BrandBo extends BaseEntity {
 
     /**
      * 品牌ID
@@ -23,6 +23,7 @@ public class BrandBo extends TenantEntity {
     /**
      * 品牌名称
      */
+    @NotBlank(message = "品牌名称不能为空")
     private String name;
 
     /**

+ 10 - 2
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/DiBuBo.java

@@ -1,10 +1,11 @@
 package org.dromara.commodityManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DiBu;
-import org.dromara.common.tenant.core.TenantEntity;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 底布业务对象
@@ -12,7 +13,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = DiBu.class, reverseConvertGenerate = false)
-public class DiBuBo extends TenantEntity {
+public class DiBuBo extends BaseEntity {
 
     /**
      * 底布Id
@@ -22,26 +23,31 @@ public class DiBuBo extends TenantEntity {
     /**
      * 名称
      */
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**
      * 颜色
      */
+    @NotBlank(message = "颜色不能为空")
     private String color;
 
     /**
      * 门幅
      */
+    @NotBlank(message = "门幅不能为空")
     private String menfu;
 
     /**
      * 克重
      */
+    @NotBlank(message = "克重不能为空")
     private String weight;
 
     /**
      * 单价
      */
+    @NotBlank(message = "单价不能为空")
     private String price;
 
     /**
@@ -52,11 +58,13 @@ public class DiBuBo extends TenantEntity {
     /**
      * 单位
      */
+    @NotBlank(message = "单位不能为空")
     private String unit;
 
     /**
      * 针织
      */
+    @NotBlank(message = "针织不能为空")
     private String zhenzhi;
 
     /**

+ 2 - 1
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/OemBo.java

@@ -5,6 +5,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.tenant.core.TenantEntity;
 
 /**
@@ -13,7 +14,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Oem.class, reverseConvertGenerate = false)
-public class OemBo extends TenantEntity {
+public class OemBo extends BaseEntity {
     /**
      * 花型号 ID
      */