fix:优化代码

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Craft.java

@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
 @TableName("fa_kuyou_goods_type_extend")
-public class Craft {
+public class Craft extends TenantEntity {
     /**
      * 工艺ID
      */
@@ -55,16 +56,4 @@ public class Craft {
      * 订单状态
      */
     private String orderStatus;
-    /**
-     * 创建时间
-     */
-    private int createTime;
-    /**
-     * 更新时间
-     */
-    private int updateTime;
-    /**
-     * 租户ID
-     */
-    private Long tenantId;
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/DiBu.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -14,7 +13,6 @@ public class DiBu {
     /**
      * 底布ID
      */
-    @TableId("id")
     private Long id;
 
     /**

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Oem.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -10,7 +9,6 @@ public class Oem {
     /**
      * 花型号 ID
      */
-    @TableId("id")
     private Long id;
     /**
      * 租户ID

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/CraftBo.java

@@ -4,13 +4,14 @@ import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 工艺对象
  */
 @Data
 @AutoMapper(target = Craft.class, reverseConvertGenerate = false)
-public class CraftBo {
+public class CraftBo extends BaseEntity {
     /**
      * 工艺ID
      */
@@ -56,16 +57,4 @@ public class CraftBo {
      * 订单状态
      */
     private String orderStatus;
-    /**
-     * 创建时间
-     */
-    private int createTime;
-    /**
-     * 更新时间
-     */
-    private int updateTime;
-    /**
-     * 租户ID
-     */
-    private Long tenantId;
 }

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.DiBu;
@@ -15,7 +14,6 @@ public class DiBuBo {
     /**
      * 底布Id
      */
-    @TableId("id")
     private Long id;
 
     /**

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/CraftVo.java

@@ -3,13 +3,15 @@ package org.dromara.commodityManagement.domain.vo;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 工艺值对象
  */
 @Data
 @AutoMapper(target = Craft.class)
-public class CraftVo {
+public class CraftVo extends BaseEntity {
     /**
      * 工艺ID
      */
@@ -54,16 +56,4 @@ public class CraftVo {
      * 订单状态
      */
     private String orderStatus;
-    /**
-     * 创建时间
-     */
-    private int createTime;
-    /**
-     * 更新时间
-     */
-    private int updateTime;
-    /**
-     * 租户ID
-     */
-    private Long tenantId;
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/DiBuVo.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.DiBu;
@@ -15,7 +14,6 @@ public class DiBuVo {
     /**
      * 底布ID
      */
-    @TableId("id")
     private Long id;
 
     /**

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/DiBuMapper.java

@@ -1,9 +1,9 @@
 package org.dromara.commodityManagement.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.DiBu;
 import org.dromara.commodityManagement.domain.vo.DiBuVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.mapstruct.Mapper;
 
 /**
  * 底布Mapper

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/OemMapper.java

@@ -1,9 +1,9 @@
 package org.dromara.commodityManagement.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.Oem;
 import org.dromara.commodityManagement.domain.vo.OemVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.mapstruct.Mapper;
 
 /**
  * 花型号Mapper

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/CraftServiceImpl.java

@@ -33,7 +33,6 @@ public class CraftServiceImpl implements CraftService {
     public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craftBo, PageQuery pageQuery) {
         QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(craftBo.getGoodsTypeExtendName()), "goods_type_extend_name", craftBo.getGoodsTypeExtendName());
-        queryWrapper.eq(0 != craftBo.getTenantId(), "goods_type_extend_type", craftBo.getTenantId());
         Page<CraftVo> page = craftMapper.selectVoPage(pageQuery.build(), queryWrapper);
         return TableDataInfo.build(page);
     }