diff --git a/tashow-feign/tashow-product-api/pom.xml b/tashow-feign/tashow-product-api/pom.xml
index 69de939..8c5746d 100644
--- a/tashow-feign/tashow-product-api/pom.xml
+++ b/tashow-feign/tashow-product-api/pom.xml
@@ -40,6 +40,46 @@
             <artifactId>mybatis</artifactId>
             <version>3.5.13</version> <!-- 推荐使用最新稳定版本 -->
         </dependency>
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <!-- Swagger Core -->
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>2.2.20</version>
+        </dependency>
+
+        <!-- Swagger Models -->
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>2.2.20</version>
+        </dependency>
+        <!-- EasyExcel 核心库 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.9</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-data-mybatis</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/CategoryApi.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/CategoryApi.java
new file mode 100644
index 0000000..5a8f109
--- /dev/null
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/CategoryApi.java
@@ -0,0 +1,24 @@
+package com.tashow.cloud.productapi.api.product;
+
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import com.tashow.cloud.productapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+/** RPC 服务 - 参数配置 */
+public interface CategoryApi {
+
+  String PREFIX = ApiConstants.PREFIX + "/category";
+
+  /** 根据参数键查询参数值 */
+  @GetMapping(PREFIX + "/categoryList")
+  List<CategoryDO> categoryList(@RequestParam(value = "grade", required = false) Integer grade,
+                                @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                @RequestParam(value = "categoryName", required = false) String categoryName,
+                                @RequestParam(value = "status", required = false) Integer status);
+}
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDO.java
similarity index 74%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDO.java
index 2fed06c..346dbe9 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/CategoryDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDO.java
@@ -1,11 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 /**
  * 产品类目 DO
@@ -60,7 +63,8 @@ public class CategoryDO extends BaseDO {
     /**
      * 标签
      */
-    private String tag;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> tag;
     /**
      * 排序
      */
diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java
new file mode 100644
index 0000000..baac0ce
--- /dev/null
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java
@@ -0,0 +1,72 @@
+package com.tashow.cloud.productapi.api.product.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 产品类目 DO
+ *
+ * @author 芋道源码
+ */
+@Data
+
+public class CategoryDto {
+
+    /**
+     * 类目ID
+     */
+    private Long categoryId;
+    /**
+     * 店铺ID
+     */
+    private Long shopId;
+    /**
+     * 父节点
+     */
+    private Long parentId;
+
+    /**
+     * 父节名称
+     */
+    private String parentName;
+
+    /**
+     * 产品类目名称
+     */
+    private String categoryName;
+    /**
+     * 类目图标
+     */
+    private String icon;
+    /**
+     * 类目的显示图片
+     */
+    private String pic;
+    /**
+     * 类目描述
+     */
+    private String description;
+    /**
+     * 标签
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> tag;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 默认是1，表示正常状态,0为下线状态
+     */
+    private Integer status;
+    /**
+     * 分类层级 1、2、3级
+     */
+    private Integer grade;
+
+
+
+}
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java
index 028dc50..a5722c6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeeDatesDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java
@@ -1,12 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
 
 /**
  * 特殊日期附加费用规则 DO
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeePeriodsDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeePeriodsDO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeePeriodsDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeePeriodsDO.java
index 023c048..2f3ec84 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdAdditionalFeePeriodsDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeePeriodsDO.java
@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 特殊时段附加费用规则 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdDO.java
similarity index 90%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdDO.java
index f40f8e8..ac92c84 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdDO.java
@@ -1,13 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+
+import java.util.List;
 
 /**
  * 商品 DO
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java
index d93fb7d..2c03732 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品紧急响应服务设置 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseIntervalsDO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseIntervalsDO.java
index 3c20793..bdecbdb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdEmergencyResponseIntervalsDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseIntervalsDO.java
@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 紧急响应时间区间设置 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdExtendDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdExtendDO.java
similarity index 80%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdExtendDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdExtendDO.java
index fe68815..d41b785 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdExtendDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdExtendDO.java
@@ -1,11 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
 /**
  * 属性规则 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropDO.java
similarity index 71%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropDO.java
index 856c7fa..660a13a 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropDO.java
@@ -1,10 +1,15 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
 
+import java.util.List;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品属性 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropValueDO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropValueDO.java
index 080c6f7..3b8c1bb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdPropValueDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropValueDO.java
@@ -1,10 +1,10 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
 import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 属性规则 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdReservationConfigDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java
similarity index 87%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdReservationConfigDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java
index a3aac02..abb344c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdReservationConfigDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品预约配置 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreaRelevanceDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreaRelevanceDO.java
similarity index 67%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreaRelevanceDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreaRelevanceDO.java
index e8f73c5..c9594bd 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreaRelevanceDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreaRelevanceDO.java
@@ -1,10 +1,10 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
 import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品与服务区域关联 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreasDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreasDO.java
similarity index 72%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreasDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreasDO.java
index 8cbe2e9..2427959 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceAreasDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceAreasDO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务区域 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceOverAreaRulesDO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceOverAreaRulesDO.java
index f1c782a..774a691 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdServiceOverAreaRulesDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdServiceOverAreaRulesDO.java
@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 超区规则 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdTagsDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdTagsDO.java
similarity index 69%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdTagsDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdTagsDO.java
index 0991c95..c29c5b8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdTagsDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdTagsDO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品和标签管理 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdWeightRangePricesDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdWeightRangePricesDO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdWeightRangePricesDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdWeightRangePricesDO.java
index 83b3fb4..074e3c2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProdWeightRangePricesDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdWeightRangePricesDO.java
@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 体重区间价格 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProductOrderLimitDO.java
similarity index 76%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProductOrderLimitDO.java
index 0aef51c..1fb7010 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ProductOrderLimitDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProductOrderLimitDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品接单上限设置 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ShopDetailDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ShopDetailDO.java
similarity index 90%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ShopDetailDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ShopDetailDO.java
index 231b3c8..595af98 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/ShopDetailDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ShopDetailDO.java
@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 店铺信息 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuDO.java
similarity index 90%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuDO.java
index f388d73..fa430d0 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuDO.java
@@ -1,17 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 单品SKU DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDeliverDO.java
similarity index 82%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDeliverDO.java
index 9fc4253..57ad3bc 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDeliverDO.java
@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务交付方式 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDetailsDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDetailsDO.java
similarity index 84%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDetailsDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDetailsDO.java
index 4a67cc4..d08f625 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDetailsDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceDetailsDO.java
@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务详情 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceMaterialDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceMaterialDO.java
similarity index 74%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceMaterialDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceMaterialDO.java
index d41d9a3..70de6cc 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceMaterialDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceMaterialDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务物料详情 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceTransportDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceTransportDO.java
similarity index 79%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceTransportDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceTransportDO.java
index c894f64..584219b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceTransportDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServiceTransportDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务遗体运输 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServicesFormDO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServicesFormDO.java
index adcb89e..35cb66f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuServicesFormDO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品SKU扩展服务表单 DO
  *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryPageReqVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryPageReqVO.java
index 5603b2f..551f9b8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryPageReqVO.java
@@ -1,11 +1,14 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -34,7 +37,7 @@ public class CategoryPageReqVO extends PageParam {
     private String description;
 
     @Schema(description = "标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序")
     private Integer sort;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryRespVO.java
similarity index 89%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryRespVO.java
index b0c1d4d..83b2dae 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategoryRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategoryRespVO.java
@@ -1,11 +1,12 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 产品类目 Response VO")
 @Data
@@ -42,7 +43,7 @@ public class CategoryRespVO {
 
     @Schema(description = "标签")
     @ExcelProperty("标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("排序")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategorySaveReqVO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategorySaveReqVO.java
index 84ef5c0..366df2d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/category/CategorySaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategorySaveReqVO.java
@@ -1,9 +1,11 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 产品类目新增/修改 Request VO")
 @Data
@@ -16,7 +18,7 @@ public class CategorySaveReqVO {
     private Long shopId;
 
     @Schema(description = "父节点", requiredMode = Schema.RequiredMode.REQUIRED, example = "16509")
-    @NotNull(message = "父节点不能为空")
+    //@NotNull(message = "父节点不能为空")
     private Long parentId;
 
     /**
@@ -25,7 +27,7 @@ public class CategorySaveReqVO {
     private String parentName;
 
     @Schema(description = "产品类目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotEmpty(message = "产品类目名称不能为空")
+    //@NotEmpty(message = "产品类目名称不能为空")
     private String categoryName;
 
     @Schema(description = "类目图标")
@@ -38,7 +40,7 @@ public class CategorySaveReqVO {
     private String description;
 
     @Schema(description = "标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer sort;
@@ -47,7 +49,7 @@ public class CategorySaveReqVO {
     private Integer status;
 
     @Schema(description = "分类层级 1级 2级 3级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "分类层级不能为空")
+    //@NotNull(message = "分类层级不能为空")
     private Integer grade;
 
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdPageReqVO.java
similarity index 98%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdPageReqVO.java
index 485806d..faa0880 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdPageReqVO.java
@@ -1,4 +1,4 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.tashow.cloud.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRespVO.java
similarity index 98%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRespVO.java
index 655c9c7..a2d6298 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRespVO.java
@@ -1,4 +1,4 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java
similarity index 91%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java
index 5d1a827..9331648 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java
@@ -1,13 +1,11 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.tashow.cloud.product.dto.SkuDO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
-//import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import com.tashow.cloud.productapi.api.product.dto.SkuDO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
-import org.apache.ibatis.type.TypeHandler;
+
 import java.util.List;
 
 @Schema(description = "管理后台 - 商品新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java
similarity index 82%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java
index 25db6a4..d7292b2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prod/ProdServiceVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java
@@ -1,14 +1,11 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.tashow.cloud.product.dto.*;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
+import com.tashow.cloud.productapi.api.product.dto.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "商品服务配置 VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java
index 1d183f1..d5f251c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java
@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java
similarity index 89%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java
index 9317208..80da4d7 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesRespVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java
index 1032ad2..7503ace 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeDatesSaveReqVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java
similarity index 76%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java
index b560c1e..f941465 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsPageReqVO.java
@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java
similarity index 86%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java
index 9583f4e..e3e5e67 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsRespVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java
similarity index 85%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java
index 2d0cecb..83d2b34 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeeperiods/ProdAdditionalFeePeriodsSaveReqVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java
index e31cbe1..1673a4e 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java
@@ -1,14 +1,10 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseDO;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java
index 1f8c1c1..f60e14a 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponsePageReqVO.java
@@ -1,13 +1,12 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java
similarity index 89%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java
index dbeb629..8bfbab4 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseRespVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java
similarity index 86%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java
index 998c9ed..4098cbc 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyResponseSaveReqVO.java
@@ -1,10 +1,9 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java
index 9136648..63d8793 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java
@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java
similarity index 89%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java
index dd9492e..efc64d4 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java
@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java
index daabe0f..2beaae8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropPageReqVO.java
similarity index 84%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropPageReqVO.java
index 93ae248..1bb805d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropPageReqVO.java
@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 商品属性分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropRespVO.java
similarity index 83%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropRespVO.java
index 0958d60..0917922 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropRespVO.java
@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品属性 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropSaveReqVO.java
similarity index 83%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropSaveReqVO.java
index ad5b971..aa2122d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodprop/ProdPropSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropSaveReqVO.java
@@ -1,11 +1,12 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品属性新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValuePageReqVO.java
similarity index 79%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValuePageReqVO.java
index 9449bbd..f0a69b3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValuePageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValuePageReqVO.java
@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 属性规则分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueRespVO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueRespVO.java
index e8e2758..eba9eb2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueRespVO.java
@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 属性规则 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java
similarity index 80%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java
index 908b528..6cefb94 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProdPropValueSaveReqVO.java
@@ -1,9 +1,7 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 属性规则新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java
index 637f866..6ae58b1 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigPageReqVO.java
@@ -1,13 +1,12 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品预约配置分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java
similarity index 93%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java
index 8b0ad65..2eaff01 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigRespVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品预约配置 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java
similarity index 92%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java
index e0a4298..61a0daf 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationConfigSaveReqVO.java
@@ -1,10 +1,10 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品预约配置新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java
similarity index 67%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java
index 5db12e1..7eb3f03 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevancePageReqVO.java
@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 商品与服务区域关联分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java
similarity index 73%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java
index d32d6a5..001a867 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceRespVO.java
@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品与服务区域关联 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java
index 4952162..d3d8da6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodservicearearelevance/ProdServiceAreaRelevanceSaveReqVO.java
@@ -1,9 +1,7 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品与服务区域关联新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java
similarity index 70%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java
index 3ec8a86..b2089ae 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasInfoVO.java
@@ -1,15 +1,10 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 服务区域 Response VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java
similarity index 84%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java
index a8f653e..691a166 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasPageReqVO.java
@@ -1,10 +1,12 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasRespVO.java
similarity index 79%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasRespVO.java
index 90fb4f3..3cbbd92 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasRespVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 服务区域 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java
similarity index 81%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java
index c63d605..a78387b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceareas/ProdServiceAreasSaveReqVO.java
@@ -1,9 +1,8 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 服务区域新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java
index c509dfc..df89b7d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesPageReqVO.java
@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.vo.prodserviceoverarearules;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 超区规则分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java
similarity index 87%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java
index a4f55b2..051e8bc 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesRespVO.java
@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.prodserviceoverarearules;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 超区规则 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java
similarity index 85%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java
index e62ce66..2a27e6f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodserviceoverarearules/ProdServiceOverAreaRulesSaveReqVO.java
@@ -1,11 +1,10 @@
-package com.tashow.cloud.product.vo.prodserviceoverarearules;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 超区规则新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsPageReqVO.java
similarity index 82%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsPageReqVO.java
index 6bf6034..7481290 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsPageReqVO.java
@@ -1,10 +1,12 @@
-package com.tashow.cloud.product.vo.prodtags;
+package com.tashow.cloud.productapi.api.product.vo.prodtags;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsRespVO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsRespVO.java
index e4694bc..4bf33d3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsRespVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodtags;
+package com.tashow.cloud.productapi.api.product.vo.prodtags;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品和标签管理 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsSaveReqVO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsSaveReqVO.java
index a43c371..235fcb5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodtags/ProdTagsSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodtags/ProdTagsSaveReqVO.java
@@ -1,9 +1,7 @@
-package com.tashow.cloud.product.vo.prodtags;
+package com.tashow.cloud.productapi.api.product.vo.prodtags;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品和标签管理新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java
similarity index 76%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java
index 99ba638..e9133f0 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitPageReqVO.java
@@ -1,13 +1,12 @@
-package com.tashow.cloud.product.vo.productorderlimit;
+package com.tashow.cloud.productapi.api.product.vo.productorderlimit;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品接单上限设置分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitRespVO.java
similarity index 86%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitRespVO.java
index fd26956..4cada44 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitRespVO.java
@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.productorderlimit;
+package com.tashow.cloud.productapi.api.product.vo.productorderlimit;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品接单上限设置 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java
similarity index 85%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java
index c7a5ead..1518f1b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/productorderlimit/ProductOrderLimitSaveReqVO.java
@@ -1,10 +1,9 @@
-package com.tashow.cloud.product.vo.productorderlimit;
+package com.tashow.cloud.productapi.api.product.vo.productorderlimit;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 商品接单上限设置新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java
similarity index 70%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java
index 4b37d8a..3fb0f4e 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesPageReqVO.java
@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.prodweightrangeprices;
+package com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 体重区间价格分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java
similarity index 83%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java
index 4255795..9661f5b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesRespVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodweightrangeprices;
+package com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 体重区间价格 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java
similarity index 83%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java
index afeb57a..52e8bd6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveReqVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodweightrangeprices;
+package com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 体重区间价格新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailPageReqVO.java
similarity index 95%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailPageReqVO.java
index 939d6a7..4f7d3ec 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailPageReqVO.java
@@ -1,11 +1,13 @@
-package com.tashow.cloud.product.vo.shopdetail;
+package com.tashow.cloud.productapi.api.product.vo.shopdetail;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailRespVO.java
similarity index 95%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailRespVO.java
index 9278140..e2f0804 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailRespVO.java
@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.shopdetail;
+package com.tashow.cloud.productapi.api.product.vo.shopdetail;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 店铺信息 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailSaveReqVO.java
similarity index 95%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailSaveReqVO.java
index 5d64c4e..d353971 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/shopdetail/ShopDetailSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/shopdetail/ShopDetailSaveReqVO.java
@@ -1,9 +1,8 @@
-package com.tashow.cloud.product.vo.shopdetail;
+package com.tashow.cloud.productapi.api.product.vo.shopdetail;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 店铺信息新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuExtendVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuExtendVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuExtendVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuExtendVO.java
index 3d54616..cea9a38 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuExtendVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuExtendVO.java
@@ -1,8 +1,9 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import com.tashow.cloud.product.dto.*;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPageReqVO.java
similarity index 60%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPageReqVO.java
index ad97d4b..22bdfbb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPageReqVO.java
@@ -1,14 +1,10 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 单品SKU分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropInfoVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropInfoVO.java
similarity index 70%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropInfoVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropInfoVO.java
index 0d301eb..2b03b8f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropInfoVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropInfoVO.java
@@ -1,8 +1,6 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.SkuDO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropVO.java
similarity index 74%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropVO.java
index 04a4983..c91cd39 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuPropVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPropVO.java
@@ -1,7 +1,7 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import com.tashow.cloud.product.dto.SkuDO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuDO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRecycleBinVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java
similarity index 80%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRecycleBinVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java
index 9b0008b..f1c14fb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRecycleBinVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java
@@ -1,13 +1,10 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tashow.cloud.product.dto.ProdPropDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class SkuRecycleBinVO {
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRespVO.java
similarity index 95%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRespVO.java
index 7f4f9e5..ecebf18 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRespVO.java
@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 单品SKU Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java
similarity index 95%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java
index fef9f51..2c31958 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java
@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 单品SKU新增/修改 Request VO")
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuServiceExtendVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuServiceExtendVO.java
similarity index 74%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuServiceExtendVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuServiceExtendVO.java
index 3ad2a8c..c273839 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuServiceExtendVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuServiceExtendVO.java
@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.sku;
 
-import com.tashow.cloud.product.dto.SkuServiceDeliverDO;
-import com.tashow.cloud.product.dto.SkuServiceDetailsDO;
-import com.tashow.cloud.product.dto.SkuServiceMaterialDO;
-import com.tashow.cloud.product.dto.SkuServiceTransportDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java
index 0468fb4..435b059 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java
@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.skuservicedeliver;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedeliver;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 服务交付方式分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java
similarity index 88%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java
index 1b47003..09d3353 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.skuservicedeliver;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedeliver;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 服务交付方式 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java
similarity index 86%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java
index 51439f5..e431f23 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.skuservicedeliver;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedeliver;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 服务交付方式新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java
similarity index 82%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java
index 6a43e34..b0fc298 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java
@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.skuservicedetails;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedetails;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 服务详情分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java
similarity index 89%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java
index 788df13..e7209f7 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.skuservicedetails;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedetails;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 服务详情 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java
similarity index 87%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java
index d0d39d0..72e359c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java
@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.skuservicedetails;
+package com.tashow.cloud.productapi.api.product.vo.skuservicedetails;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 服务详情新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java
similarity index 66%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java
index 28fda2a..fb32419 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java
@@ -1,13 +1,10 @@
-package com.tashow.cloud.product.vo.skuservicematerial;
+package com.tashow.cloud.productapi.api.product.vo.skuservicematerial;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 服务物料详情分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java
similarity index 78%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java
index d0d521e..8535534 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicematerial;
+package com.tashow.cloud.productapi.api.product.vo.skuservicematerial;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 服务物料详情 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java
similarity index 77%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java
index 48baae7..142a28f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicematerial;
+package com.tashow.cloud.productapi.api.product.vo.skuservicematerial;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 服务物料详情新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormPageReqVO.java
similarity index 67%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormPageReqVO.java
index 37cc8e7..fe86b67 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormPageReqVO.java
@@ -1,13 +1,10 @@
-package com.tashow.cloud.product.vo.skuservicesform;
+package com.tashow.cloud.productapi.api.product.vo.skuservicesform;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 商品SKU扩展服务表单分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormRespVO.java
similarity index 80%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormRespVO.java
index 72e2d88..6bcd051 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormRespVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicesform;
+package com.tashow.cloud.productapi.api.product.vo.skuservicesform;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品SKU扩展服务表单 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java
similarity index 80%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java
index 0a4aacc..766e334 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicesform;
+package com.tashow.cloud.productapi.api.product.vo.skuservicesform;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 商品SKU扩展服务表单新增/修改 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java
similarity index 73%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java
index e8aefab..f9870f2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java
@@ -1,13 +1,10 @@
-package com.tashow.cloud.product.vo.skuservicetransport;
+package com.tashow.cloud.productapi.api.product.vo.skuservicetransport;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 服务遗体运输分页 Request VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportRespVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportRespVO.java
similarity index 85%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportRespVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportRespVO.java
index 2cf0458..3098371 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportRespVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportRespVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicetransport;
+package com.tashow.cloud.productapi.api.product.vo.skuservicetransport;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 服务遗体运输 Response VO")
 @Data
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java
similarity index 84%
rename from tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java
rename to tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java
index bdce9d8..18e9dba 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java
@@ -1,11 +1,9 @@
-package com.tashow.cloud.product.vo.skuservicetransport;
+package com.tashow.cloud.productapi.api.product.vo.skuservicetransport;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 服务遗体运输新增/修改 Request VO")
 @Data
diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/general/StringListTypeHandler.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/general/StringListTypeHandler.java
index 40472f1..8a5a612 100644
--- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/general/StringListTypeHandler.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/general/StringListTypeHandler.java
@@ -2,6 +2,8 @@ package com.tashow.cloud.productapi.general;
 
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -14,6 +16,8 @@ import java.util.List;
 /**
  * 处理 List<String> 与数据库逗号分隔字符串之间的转换
  */
+@MappedTypes(List.class)
+@MappedJdbcTypes(JdbcType.VARCHAR)
 public class StringListTypeHandler extends BaseTypeHandler<List<String>> {
 
     @Override
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/CategoryApiImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/CategoryApiImpl.java
new file mode 100644
index 0000000..399ae38
--- /dev/null
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/CategoryApiImpl.java
@@ -0,0 +1,23 @@
+package com.tashow.cloud.product.api;
+
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.product.service.CategoryService;
+import com.tashow.cloud.productapi.api.product.CategoryApi;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+@RestController // 提供 RESTful API 接口，给 Feign 调用
+@Validated
+public class CategoryApiImpl implements CategoryApi {
+
+    @Resource
+    private CategoryService categoryService;
+
+    @Override
+    public List<CategoryDO> categoryList(Integer grade, Long categoryId,String categoryName, Integer status) {
+        return categoryService.categoryList(grade, categoryId,categoryName, status);
+    }
+}
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java
index 691d628..b06eee1 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/CategoryController.java
@@ -2,9 +2,10 @@ package com.tashow.cloud.product.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
 import com.tashow.cloud.product.service.CategoryService;
-import com.tashow.cloud.product.vo.category.CategorySaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import com.tashow.cloud.productapi.api.product.vo.CategorySaveReqVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -19,7 +20,7 @@ import static com.tashow.cloud.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 产品类目")
 @RestController
-@RequestMapping("/category")
+@RequestMapping("/product/category")
 @Validated
 public class CategoryController {
 
@@ -32,23 +33,11 @@ public class CategoryController {
      */
     @PermitAll
     @GetMapping("/categoryList")
-    public CommonResult<List<CategoryDO>> categoryList( @RequestParam(value = "grade", required = false) Integer grade,
+    public CommonResult<List<CategoryDO>> categoryList(@RequestParam(value = "grade", required = false) Integer grade,
                                                         @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                                        @RequestParam(value = "categoryName", required = false) String categoryName,
                                                         @RequestParam(value = "status", required = false) Integer status) {
-        LambdaQueryWrapper<CategoryDO> wrapper = new LambdaQueryWrapper<>();
-        //TODO 获取当前登录用户
-        wrapper.eq(CategoryDO::getShopId, 1L);
-        if(grade != null) {
-            wrapper.eq(CategoryDO::getGrade, grade);
-        }
-        if(categoryId != null) {
-            wrapper.eq(CategoryDO::getCategoryId, categoryId);
-        }
-        if (status != null){
-            wrapper.eq(CategoryDO::getStatus, status);
-        }
-        List<CategoryDO> categoryMenuList = categoryService.list(wrapper);
-        return success(categoryMenuList);
+        return success(categoryService.categoryList(grade, categoryId,categoryName, status));
     }
     @PostMapping("/create")
     @Operation(summary = "创建产品类目")
@@ -60,7 +49,7 @@ public class CategoryController {
     @PutMapping("/update")
     @Operation(summary = "更新产品类目")
     @PermitAll
-    public CommonResult<Boolean> updateCategory(@Valid @RequestBody CategorySaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateCategory(@RequestBody CategorySaveReqVO updateReqVO) {
         categoryService.updateCategory(updateReqVO);
         return success(true);
     }
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java
index 9e859a6..cac5ac5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeeDatesController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
 import com.tashow.cloud.product.service.ProdAdditionalFeeDatesService;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesRespVO;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java
index d2dc03e..ad729e6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdAdditionalFeePeriodsController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
 import com.tashow.cloud.product.service.ProdAdditionalFeePeriodsService;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsRespVO;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
index 3b3afe5..4349071 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
@@ -2,11 +2,11 @@ package com.tashow.cloud.product.controller.admin;
 
 import com.tashow.cloud.common.pojo.CommonResult;
 import com.tashow.cloud.common.pojo.PageResult;
-import com.tashow.cloud.product.dto.ProdDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdDO;
 import com.tashow.cloud.product.service.ProdService;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.prod.ProdSaveReqVO;
-import com.tashow.cloud.product.vo.prod.ProdServiceVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,7 +20,7 @@ import static com.tashow.cloud.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 商品")
 @RestController
-@RequestMapping("/prod")
+@RequestMapping("/product/prod")
 @Validated
 public class ProdController {
 
@@ -52,7 +52,7 @@ public class ProdController {
         return success(true);
     }
 
-    @GetMapping("/get")
+    @GetMapping("/getProdService")
     @Operation(summary = "获得商品服务信息")
     @Parameter(name = "prodId", description = "商品id", required = true, example = "1024")
     @PermitAll
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java
index 3c1e133..c84de7f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseDO;
 import com.tashow.cloud.product.service.ProdEmergencyResponseService;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseRespVO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponseRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java
index 38391ab..da364ac 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdEmergencyResponseIntervalsController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
 import com.tashow.cloud.product.service.ProdEmergencyResponseIntervalsService;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsRespVO;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java
index 78b147a..f9a4924 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropController.java
@@ -3,11 +3,11 @@ package com.tashow.cloud.product.controller.admin;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.service.ProdPropService;
 import com.tashow.cloud.product.service.ProdPropValueService;
-import com.tashow.cloud.product.vo.prodprop.ProdPropRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropRespVO;
 import com.tashow.cloud.productapi.enums.ProdPropRule;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java
index 19866f3..cd2e549 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdPropValueController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.service.ProdPropValueService;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValuePageReqVO;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueRespVO;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValuePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValueRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java
index 3baac44..99091c6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdReservationConfigController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdReservationConfigDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO;
 import com.tashow.cloud.product.service.ProdReservationConfigService;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigRespVO;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java
index 5f66389..880eb54 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreaRelevanceController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdServiceAreaRelevanceDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreaRelevanceDO;
 import com.tashow.cloud.product.service.ProdServiceAreaRelevanceService;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceRespVO;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java
index 5af8b51..ba61dd9 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceAreasController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdServiceAreasDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreasDO;
 import com.tashow.cloud.product.service.ProdServiceAreasService;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasRespVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java
index ef961d1..11ff7de 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdServiceOverAreaRulesController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceOverAreaRulesDO;
 import com.tashow.cloud.product.service.ProdServiceOverAreaRulesService;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java
index 0d2aaea..e0e1d06 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdTagsController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdTagsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdTagsDO;
 import com.tashow.cloud.product.service.ProdTagsService;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsPageReqVO;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsRespVO;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java
index 274dcd9..a3e91f5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdWeightRangePricesController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProdWeightRangePricesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
 import com.tashow.cloud.product.service.ProdWeightRangePricesService;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesRespVO;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesRespVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java
index ea67554..00d8b9e 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProductOrderLimitController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ProductOrderLimitDO;
+import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
 import com.tashow.cloud.product.service.ProductOrderLimitService;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitRespVO;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitRespVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java
index 5f97c1a..4f9c6ad 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ShopDetailController.java
@@ -5,11 +5,14 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.ShopDetailDO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
 import com.tashow.cloud.product.service.ShopDetailService;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailPageReqVO;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailRespVO;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailRespVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java
index fb293f3..e0c3ba5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuController.java
@@ -3,13 +3,13 @@ package com.tashow.cloud.product.controller.admin;
 import com.tashow.cloud.common.pojo.CommonResult;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
-import com.tashow.cloud.product.dto.*;
+import com.tashow.cloud.productapi.api.product.dto.*;
 import com.tashow.cloud.product.mapper.SkuMapper;
 import com.tashow.cloud.product.service.ProdExtendService;
 import com.tashow.cloud.product.service.ProdPropService;
 import com.tashow.cloud.product.service.ProdPropValueService;
 import com.tashow.cloud.product.service.SkuService;
-import com.tashow.cloud.product.vo.sku.*;
+import com.tashow.cloud.productapi.api.product.vo.sku.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java
index 70366c8..43480a7 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDeliverController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
 import com.tashow.cloud.product.service.SkuServiceDeliverService;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverRespVO;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverRespVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java
index 58a876d..9de48e6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceDetailsController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
 import com.tashow.cloud.product.service.SkuServiceDetailsService;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsRespVO;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsRespVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java
index fc4d8d8..055e2c8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceMaterialController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
 import com.tashow.cloud.product.service.SkuServiceMaterialService;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialRespVO;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialRespVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java
index d9dd273..5c818b5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServiceTransportController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.SkuServiceTransportDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
 import com.tashow.cloud.product.service.SkuServiceTransportService;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportRespVO;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportRespVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java
index 14c7ba5..0459b16 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/SkuServicesFormController.java
@@ -5,11 +5,11 @@ import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.excel.excel.core.util.ExcelUtils;
-import com.tashow.cloud.product.dto.SkuServicesFormDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServicesFormDO;
 import com.tashow.cloud.product.service.SkuServicesFormService;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormPageReqVO;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormRespVO;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormRespVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
 import com.tashow.cloud.web.apilog.core.annotation.ApiAccessLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/CategoryMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/CategoryMapper.java
index 290dda0..ccaff7d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/CategoryMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/CategoryMapper.java
@@ -5,9 +5,10 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
 /**
  * 产品类目 Mapper
  *
@@ -16,6 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CategoryMapper extends BaseMapperX<CategoryDO> {
 
-
+    /**
+     * 根据条件查询类目列表
+     */
+    List<CategoryDO> selectCategoryList(@Param("grade") Integer grade,
+                                         @Param("categoryId") Long categoryId,
+                                         @Param("categoryName") String categoryName,
+                                         @Param("status") Integer status,
+                                         @Param("shopId") Long shopId);
 
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java
index 515e425..64af0b7 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeeDatesMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeePeriodsMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeePeriodsMapper.java
index 2a2859c..3a97ed5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeePeriodsMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdAdditionalFeePeriodsMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseIntervalsMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseIntervalsMapper.java
index 6fee361..a433d92 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseIntervalsMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseIntervalsMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseMapper.java
index 3d0bbbd..d4a1045 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdEmergencyResponseMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdEmergencyResponseDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdExtendMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdExtendMapper.java
index 90fe399..6c8d0df 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdExtendMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdExtendMapper.java
@@ -1,8 +1,8 @@
 package com.tashow.cloud.product.mapper;
 
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdExtendDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdExtendDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
index 4748f03..12f8186 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java
@@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.*;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.prod.ProdServiceVO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.tashow.cloud.productapi.api.product.dto.*;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,12 +24,21 @@ public interface ProdMapper extends BaseMapperX<ProdDO> {
      IPage<ProdDO> getProdPageList(Page<?> page, ProdPageReqVO reqVO);
 
      ProdServiceVO selectProdService(@Param("prodId") Long prodId
-             ,@Param("regionSwitch") Integer regionSwitch
-             ,@Param("reservationSwitch") Integer reservationSwitch
-             ,@Param("emergencySwitch") Integer emergencySwitch
-             ,@Param("orderLimitSwitch") Integer orderLimitSwitch
-             ,@Param("additionalSwitch") Integer additionalSwitch
-             ,@Param("additionalFeeSwitch") Integer additionalFeeSwitch
-             ,@Param("weightSwitch") Integer weightSwitch
+             , @Param("regionSwitch") Integer regionSwitch
+             , @Param("reservationSwitch") Integer reservationSwitch
+             , @Param("emergencySwitch") Integer emergencySwitch
+             , @Param("orderLimitSwitch") Integer orderLimitSwitch
+             , @Param("additionalSwitch") Integer additionalSwitch
+             , @Param("additionalFeeSwitch") Integer additionalFeeSwitch
+             , @Param("weightSwitch") Integer weightSwitch
       );
+
+    ProdServiceVO selectProdServiceInfo(@Param("prodId") Long prodId
+            , @Param("reservationSwitch") Integer reservationSwitch
+            , @Param("emergencySwitch") Integer emergencySwitch
+            , @Param("orderLimitSwitch") Integer orderLimitSwitch
+            , @Param("additionalSwitch") Integer additionalSwitch
+            , @Param("additionalFeeSwitch") Integer additionalFeeSwitch
+            , @Param("weightSwitch") Integer weightSwitch
+    );
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropMapper.java
index e066671..262a721 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java
index 53cf230..20a24b5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdPropValueMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java
index c6c612a..a7bbe67 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdReservationConfigMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdReservationConfigDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreaRelevanceMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreaRelevanceMapper.java
index 61a2a7f..c69fe33 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreaRelevanceMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreaRelevanceMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdServiceAreaRelevanceDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreaRelevanceDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreasMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreasMapper.java
index aa4c1a9..d94d885 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreasMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceAreasMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdServiceAreasDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreasDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceOverAreaRulesMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceOverAreaRulesMapper.java
index a1bb897..a930140 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceOverAreaRulesMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdServiceOverAreaRulesMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceOverAreaRulesDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdTagsMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdTagsMapper.java
index d33c3b7..2368366 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdTagsMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdTagsMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdTagsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdTagsDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdWeightRangePricesMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdWeightRangePricesMapper.java
index 88a48b9..a941bf3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdWeightRangePricesMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdWeightRangePricesMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdWeightRangePricesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProductOrderLimitMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProductOrderLimitMapper.java
index 6ac35f1..766d8e4 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProductOrderLimitMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProductOrderLimitMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProductOrderLimitDO;
+import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ShopDetailMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ShopDetailMapper.java
index a9cc1f3..498f24b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ShopDetailMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ShopDetailMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ShopDetailDO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java
index 691a05c..c51590b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuMapper.java
@@ -4,14 +4,9 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tashow.cloud.common.pojo.PageResult;
-import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.ProdDO;
-import com.tashow.cloud.product.dto.SkuDO;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.sku.SkuRecycleBinVO;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.tashow.cloud.productapi.api.product.dto.SkuDO;
+import com.tashow.cloud.productapi.api.product.vo.sku.SkuRecycleBinVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDeliverMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDeliverMapper.java
index 38a1ff1..95a23b6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDeliverMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDeliverMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDetailsMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDetailsMapper.java
index 31e2c00..34ca4e3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDetailsMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceDetailsMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceMaterialMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceMaterialMapper.java
index be96935..9d4052b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceMaterialMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceMaterialMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceTransportMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceTransportMapper.java
index 4432bb7..2c55645 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceTransportMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServiceTransportMapper.java
@@ -5,7 +5,7 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.SkuServiceTransportDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServicesFormMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServicesFormMapper.java
index a12f272..cf5e6a6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServicesFormMapper.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/SkuServicesFormMapper.java
@@ -5,9 +5,9 @@ import java.util.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX;
 import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX;
-import com.tashow.cloud.product.dto.SkuDO;
-import com.tashow.cloud.product.dto.SkuServicesFormDO;
-import com.tashow.cloud.product.vo.sku.SkuServiceExtendVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServicesFormDO;
+import com.tashow.cloud.productapi.api.product.vo.sku.SkuServiceExtendVO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/CategoryService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/CategoryService.java
index bd6500f..b9092f2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/CategoryService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/CategoryService.java
@@ -3,13 +3,15 @@ package com.tashow.cloud.product.service;
 import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tashow.cloud.product.dto.CategoryDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
-import com.tashow.cloud.product.vo.category.CategoryPageReqVO;
-import com.tashow.cloud.product.vo.category.CategorySaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import com.tashow.cloud.productapi.api.product.vo.CategoryPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.CategorySaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 产品类目 Service 接口
@@ -18,6 +20,10 @@ import com.tashow.cloud.common.pojo.PageParam;
  */
 public interface CategoryService extends IService<CategoryDO> {
 
+
+    List<CategoryDO> categoryList(Integer grade, Long categoryId,String categoryName, Integer status);
+
+
     /**
      * 创建产品类目
      *
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeeDatesService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeeDatesService.java
index b4f15ce..0c7749b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeeDatesService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeeDatesService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeePeriodsService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeePeriodsService.java
index cad4817..9ee9afe 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeePeriodsService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdAdditionalFeePeriodsService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseIntervalsService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseIntervalsService.java
index 3a1fc1d..840182c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseIntervalsService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseIntervalsService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseService.java
index d53c836..3da93b2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdEmergencyResponseService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdEmergencyResponseDO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseDO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdExtendService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdExtendService.java
index b10e7a8..08e856a 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdExtendService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdExtendService.java
@@ -1,15 +1,8 @@
 package com.tashow.cloud.product.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tashow.cloud.common.pojo.PageResult;
-import com.tashow.cloud.product.dto.ProdExtendDO;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropPageReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
-import com.tashow.cloud.product.vo.sku.SkuPropVO;
-import jakarta.validation.Valid;
+import com.tashow.cloud.productapi.api.product.dto.ProdExtendDO;
 
-import java.util.List;
 
 /**
  * 商品属性 Service 接口
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropService.java
index 4078f7e..513a4a6 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropService.java
@@ -3,11 +3,11 @@ package com.tashow.cloud.product.service;
 import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.vo.prod.ProdSaveReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropPageReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
-import com.tashow.cloud.product.vo.sku.SkuPropVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.sku.SkuPropVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropValueService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropValueService.java
index ae01aaf..ba25b6b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropValueService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdPropValueService.java
@@ -3,10 +3,10 @@ package com.tashow.cloud.product.service;
 import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValuePageReqVO;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValuePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdReservationConfigService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdReservationConfigService.java
index 2a19183..a9cc2ab 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdReservationConfigService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdReservationConfigService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdReservationConfigDO;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
index 28f9aed..e9ed3fa 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java
@@ -2,10 +2,10 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdDO;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.prod.ProdSaveReqVO;
-import com.tashow.cloud.product.vo.prod.ProdServiceVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdDO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreaRelevanceService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreaRelevanceService.java
index 761f3bf..bb5412f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreaRelevanceService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreaRelevanceService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdServiceAreaRelevanceDO;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreaRelevanceDO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreasService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreasService.java
index 959eb73..d43455d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreasService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceAreasService.java
@@ -3,10 +3,10 @@ package com.tashow.cloud.product.service;
 import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdServiceAreasDO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreasDO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceOverAreaRulesService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceOverAreaRulesService.java
index 7702d3c..1f8f2b1 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceOverAreaRulesService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdServiceOverAreaRulesService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceOverAreaRulesDO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdTagsService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdTagsService.java
index 805c72f..ade48cb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdTagsService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdTagsService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdTagsDO;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsPageReqVO;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdTagsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdWeightRangePricesService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdWeightRangePricesService.java
index b85d681..8188680 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdWeightRangePricesService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdWeightRangePricesService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProdWeightRangePricesDO;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProductOrderLimitService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProductOrderLimitService.java
index 566ed04..719042b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProductOrderLimitService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProductOrderLimitService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ProductOrderLimitDO;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ShopDetailService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ShopDetailService.java
index 917a9d7..4c358aa 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ShopDetailService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ShopDetailService.java
@@ -2,9 +2,11 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.ShopDetailDO;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailPageReqVO;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java
index 3cf540b..a9b39e5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuService.java
@@ -2,8 +2,8 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.*;
-import com.tashow.cloud.product.vo.sku.*;
+import com.tashow.cloud.productapi.api.product.dto.*;
+import com.tashow.cloud.productapi.api.product.vo.sku.*;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDeliverService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDeliverService.java
index f9678d8..eda1e66 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDeliverService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDeliverService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.SkuServiceDeliverDO;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDetailsService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDetailsService.java
index 2da66d1..c6024ee 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDetailsService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceDetailsService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.SkuServiceDetailsDO;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceMaterialService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceMaterialService.java
index 16be043..2fa6d13 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceMaterialService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceMaterialService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.SkuServiceMaterialDO;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceTransportService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceTransportService.java
index 709badd..1469304 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceTransportService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServiceTransportService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.SkuServiceTransportDO;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServicesFormService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServicesFormService.java
index 780efd9..598a094 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServicesFormService.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/SkuServicesFormService.java
@@ -2,9 +2,9 @@ package com.tashow.cloud.product.service;
 
 import java.util.*;
 
-import com.tashow.cloud.product.dto.SkuServicesFormDO;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormPageReqVO;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServicesFormDO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
 import jakarta.validation.*;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.pojo.PageParam;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/CategoryServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/CategoryServiceImpl.java
index 72eab30..beb94c8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/CategoryServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/CategoryServiceImpl.java
@@ -1,14 +1,16 @@
 package com.tashow.cloud.product.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tashow.cloud.common.exception.ErrorCode;
-import com.tashow.cloud.product.dto.CategoryDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.mapper.CategoryMapper;
 import com.tashow.cloud.product.mapper.ProdPropValueMapper;
 import com.tashow.cloud.product.service.CategoryService;
-import com.tashow.cloud.product.vo.category.CategoryPageReqVO;
-import com.tashow.cloud.product.vo.category.CategorySaveReqVO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import com.tashow.cloud.productapi.api.product.vo.CategoryPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.CategorySaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
@@ -36,10 +38,17 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, CategoryDO>
     @Resource
     private CategoryMapper categoryMapper;
 
+    @Override
+    public List<CategoryDO> categoryList(Integer grade, Long categoryId,String categoryName, Integer status) {
+        List<CategoryDO> categoryMenuList =categoryMapper.selectCategoryList(grade, categoryId,categoryName, status,1L);
+        return categoryMenuList;
+    }
+
     @Override
     public Long createCategory(CategorySaveReqVO createReqVO) {
         // 插入
         CategoryDO category = BeanUtils.toBean(createReqVO, CategoryDO.class);
+        category.setShopId(1L);
         categoryMapper.insert(category);
         // 返回
         return category.getCategoryId();
@@ -78,4 +87,5 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, CategoryDO>
         return null;
     }
 
+
 }
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeeDatesServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeeDatesServiceImpl.java
index 48675c4..15856ed 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeeDatesServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeeDatesServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
 import com.tashow.cloud.product.mapper.ProdAdditionalFeeDatesMapper;
 import com.tashow.cloud.product.service.ProdAdditionalFeeDatesService;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeDatesSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeePeriodsServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeePeriodsServiceImpl.java
index 2ffc3b7..8bae84c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeePeriodsServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdAdditionalFeePeriodsServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
 import com.tashow.cloud.product.mapper.ProdAdditionalFeePeriodsMapper;
 import com.tashow.cloud.product.service.ProdAdditionalFeePeriodsService;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
-import com.tashow.cloud.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods.ProdAdditionalFeePeriodsSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseIntervalsServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseIntervalsServiceImpl.java
index b1f045c..00d580a 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseIntervalsServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseIntervalsServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
 import com.tashow.cloud.product.mapper.ProdEmergencyResponseIntervalsMapper;
 import com.tashow.cloud.product.service.ProdEmergencyResponseIntervalsService;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals.ProdEmergencyResponseIntervalsSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseServiceImpl.java
index cf119a2..c00baf5 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdEmergencyResponseServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdEmergencyResponseDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseDO;
 import com.tashow.cloud.product.mapper.ProdEmergencyResponseMapper;
 import com.tashow.cloud.product.service.ProdEmergencyResponseService;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
-import com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponsePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyResponseSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdExtendServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdExtendServiceImpl.java
index a780a46..171d92f 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdExtendServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdExtendServiceImpl.java
@@ -1,8 +1,8 @@
 package com.tashow.cloud.product.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tashow.cloud.product.dto.ProdExtendDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdExtendDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.mapper.ProdExtendMapper;
 import com.tashow.cloud.product.mapper.ProdPropValueMapper;
 import com.tashow.cloud.product.service.ProdExtendService;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropServiceImpl.java
index 5ca497c..492f8e8 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropServiceImpl.java
@@ -2,15 +2,15 @@ package com.tashow.cloud.product.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.mapper.ProdPropMapper;
 import com.tashow.cloud.product.mapper.ProdPropValueMapper;
 import com.tashow.cloud.product.service.ProdPropService;
-import com.tashow.cloud.product.vo.prod.ProdSaveReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropPageReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
-import com.tashow.cloud.product.vo.sku.SkuPropVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.sku.SkuPropVO;
 import com.tashow.cloud.productapi.enums.BaseEnum;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropValueServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropValueServiceImpl.java
index a0d82b4..44d62e2 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropValueServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdPropValueServiceImpl.java
@@ -1,13 +1,13 @@
 package com.tashow.cloud.product.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import com.tashow.cloud.product.mapper.ProdPropMapper;
 import com.tashow.cloud.product.mapper.ProdPropValueMapper;
 import com.tashow.cloud.product.service.ProdPropValueService;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValuePageReqVO;
-import com.tashow.cloud.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValuePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodpropvalue.ProdPropValueSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdReservationConfigServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdReservationConfigServiceImpl.java
index b580c8f..dc977b3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdReservationConfigServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdReservationConfigServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdReservationConfigDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO;
 import com.tashow.cloud.product.mapper.ProdReservationConfigMapper;
 import com.tashow.cloud.product.service.ProdReservationConfigService;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
-import com.tashow.cloud.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationConfigSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreaRelevanceServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreaRelevanceServiceImpl.java
index d3ffd2b..516cf31 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreaRelevanceServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreaRelevanceServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdServiceAreaRelevanceDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreaRelevanceDO;
 import com.tashow.cloud.product.mapper.ProdServiceAreaRelevanceMapper;
 import com.tashow.cloud.product.service.ProdServiceAreaRelevanceService;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
-import com.tashow.cloud.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevancePageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance.ProdServiceAreaRelevanceSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreasServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreasServiceImpl.java
index c7a7f65..fe7ccfb 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreasServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceAreasServiceImpl.java
@@ -1,13 +1,13 @@
 package com.tashow.cloud.product.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tashow.cloud.product.dto.ProdPropDO;
-import com.tashow.cloud.product.dto.ProdServiceAreasDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceAreasDO;
 import com.tashow.cloud.product.mapper.ProdPropMapper;
 import com.tashow.cloud.product.mapper.ProdServiceAreasMapper;
 import com.tashow.cloud.product.service.ProdServiceAreasService;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
index 6bef46c..e55ebc0 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java
@@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils;
-import com.tashow.cloud.product.dto.*;
+import com.tashow.cloud.productapi.api.product.dto.*;
 import com.tashow.cloud.product.mapper.*;
 import com.tashow.cloud.product.service.ProdPropService;
 import com.tashow.cloud.product.service.ProdService;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.prod.ProdSaveReqVO;
-import com.tashow.cloud.product.vo.prod.ProdServiceVO;
+
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import com.tashow.cloud.productapi.enums.BaseEnum;
 import lombok.val;
 import org.springframework.stereotype.Service;
@@ -244,9 +245,17 @@ public class ProdServiceImpl implements ProdService {
     @Override
     public ProdServiceVO getProdService(Long prodId) {
         ProdDO prodDO = prodMapper.selectById(prodId);
-        return prodMapper.selectProdService(prodDO.getProdId(),prodDO.getRegionSwitch(),
-                prodDO.getReservationSwitch(),prodDO.getEmergencySwitch(),prodDO.getOrderLimitSwitch(),
-                prodDO.getAdditionalSwitch(),prodDO.getAdditionalFeeSwitch(),prodDO.getWeightSwitch());
+        if(prodDO!= null&&prodDO.getRegionSwitch()==BaseEnum.YES_ONE.getKey()){
+            return prodMapper.selectProdService(prodDO.getProdId(),prodDO.getRegionSwitch(),
+                    prodDO.getReservationSwitch(),prodDO.getEmergencySwitch(),prodDO.getOrderLimitSwitch(),
+                    prodDO.getAdditionalSwitch(),prodDO.getAdditionalFeeSwitch(),prodDO.getWeightSwitch());
+        }else {
+            return prodMapper.selectProdServiceInfo(prodDO.getProdId(),
+                    prodDO.getReservationSwitch(),prodDO.getEmergencySwitch(),prodDO.getOrderLimitSwitch(),
+                    prodDO.getAdditionalSwitch(),prodDO.getAdditionalFeeSwitch(),prodDO.getWeightSwitch());
+        }
+
+
     }
 
     @Override
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceOverAreaRulesServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceOverAreaRulesServiceImpl.java
index fe89c2e..6f5e253 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceOverAreaRulesServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceOverAreaRulesServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdServiceOverAreaRulesDO;
 import com.tashow.cloud.product.mapper.ProdServiceOverAreaRulesMapper;
 import com.tashow.cloud.product.service.ProdServiceOverAreaRulesService;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdTagsServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdTagsServiceImpl.java
index c7600c9..ba4003b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdTagsServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdTagsServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdTagsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdTagsDO;
 import com.tashow.cloud.product.mapper.ProdTagsMapper;
 import com.tashow.cloud.product.service.ProdTagsService;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsPageReqVO;
-import com.tashow.cloud.product.vo.prodtags.ProdTagsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodtags.ProdTagsSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdWeightRangePricesServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdWeightRangePricesServiceImpl.java
index 8f4e423..b28f9a0 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdWeightRangePricesServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdWeightRangePricesServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProdWeightRangePricesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
 import com.tashow.cloud.product.mapper.ProdWeightRangePricesMapper;
 import com.tashow.cloud.product.service.ProdWeightRangePricesService;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
-import com.tashow.cloud.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProductOrderLimitServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProductOrderLimitServiceImpl.java
index 9a35f06..abae5d3 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProductOrderLimitServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProductOrderLimitServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ProductOrderLimitDO;
+import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
 import com.tashow.cloud.product.mapper.ProductOrderLimitMapper;
 import com.tashow.cloud.product.service.ProductOrderLimitService;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
-import com.tashow.cloud.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.productorderlimit.ProductOrderLimitSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ShopDetailServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ShopDetailServiceImpl.java
index 6c1ee51..b7bdb09 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ShopDetailServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ShopDetailServiceImpl.java
@@ -1,10 +1,12 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.ShopDetailDO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
 import com.tashow.cloud.product.mapper.ShopDetailMapper;
 import com.tashow.cloud.product.service.ShopDetailService;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailPageReqVO;
-import com.tashow.cloud.product.vo.shopdetail.ShopDetailSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.shopdetail
+.ShopDetailSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDeliverServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDeliverServiceImpl.java
index ed8e9e9..374965b 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDeliverServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDeliverServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.SkuServiceDeliverDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO;
 import com.tashow.cloud.product.mapper.SkuServiceDeliverMapper;
 import com.tashow.cloud.product.service.SkuServiceDeliverService;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedeliver.SkuServiceDeliverSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDetailsServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDetailsServiceImpl.java
index f89e4e3..bc7d53d 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDetailsServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceDetailsServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.SkuServiceDetailsDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO;
 import com.tashow.cloud.product.mapper.SkuServiceDetailsMapper;
 import com.tashow.cloud.product.service.SkuServiceDetailsService;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
-import com.tashow.cloud.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicedetails.SkuServiceDetailsSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java
index 9b3231e..d52879c 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java
@@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.tashow.cloud.common.util.date.DateUtils;
 import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils;
-import com.tashow.cloud.product.dto.*;
+import com.tashow.cloud.productapi.api.product.dto.*;
 import com.tashow.cloud.product.mapper.*;
 import com.tashow.cloud.product.service.ProdExtendService;
 import com.tashow.cloud.product.service.ProdPropService;
 import com.tashow.cloud.product.service.ProdPropValueService;
 import com.tashow.cloud.product.service.SkuService;
-import com.tashow.cloud.product.vo.prod.ProdPageReqVO;
-import com.tashow.cloud.product.vo.sku.*;
+import com.tashow.cloud.productapi.api.product.vo.sku.*;
 import com.tashow.cloud.productapi.enums.BaseEnum;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import com.tashow.cloud.productapi.enums.ServiceTypeEnum;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceMaterialServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceMaterialServiceImpl.java
index 86eea11..9131578 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceMaterialServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceMaterialServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.SkuServiceMaterialDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO;
 import com.tashow.cloud.product.mapper.SkuServiceMaterialMapper;
 import com.tashow.cloud.product.service.SkuServiceMaterialService;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
-import com.tashow.cloud.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicematerial.SkuServiceMaterialSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceTransportServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceTransportServiceImpl.java
index 267667d..41627e4 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceTransportServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceTransportServiceImpl.java
@@ -1,10 +1,10 @@
 package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.SkuServiceTransportDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO;
 import com.tashow.cloud.product.mapper.SkuServiceTransportMapper;
 import com.tashow.cloud.product.service.SkuServiceTransportService;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
-import com.tashow.cloud.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicetransport.SkuServiceTransportSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServicesFormServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServicesFormServiceImpl.java
index c07951d..5f226d1 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServicesFormServiceImpl.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServicesFormServiceImpl.java
@@ -1,10 +1,10 @@
  package com.tashow.cloud.product.service.impl;
 
-import com.tashow.cloud.product.dto.SkuServicesFormDO;
+import com.tashow.cloud.productapi.api.product.dto.SkuServicesFormDO;
 import com.tashow.cloud.product.mapper.SkuServicesFormMapper;
 import com.tashow.cloud.product.service.SkuServicesFormService;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormPageReqVO;
-import com.tashow.cloud.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.skuservicesform.SkuServicesFormSaveReqVO;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml
index 8be73bc..a8dc9eb 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml
@@ -8,5 +8,24 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
+    <select id="selectCategoryList" resultType="com.tashow.cloud.productapi.api.product.dto.CategoryDO">
+        SELECT
+        *
+        FROM tz_category
+        WHERE shop_id = #{shopId}
+        <if test="grade != null">
+            AND grade = #{grade}
+        </if>
+        <if test="categoryId != null">
+            AND category_id = #{categoryId}
+        </if>
+        <if test="categoryName != null">
+            and category_name LIKE CONCAT('%',#{categoryName},'%')
+        </if>
 
+        <if test="status != null">
+            AND status = #{status}
+        </if>
+        ORDER BY sort ASC, create_time DESC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
index f2c8975..322fa66 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
@@ -10,7 +10,7 @@
      -->
 
     <!-- 结果映射：将数据库查询结果映射到 ProdServiceVO -->
-    <resultMap id="ProdServiceResultMap" type="com.tashow.cloud.product.vo.prod.ProdServiceVO"> <!-- 确保这是 ProdServiceVO 的正确包名 -->
+    <resultMap id="ProdServiceResultMap" type="com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO"> <!-- 确保这是 ProdServiceVO 的正确包名 -->
         <!-- 商品基本信息映射 -->
         <id property="prodId" column="prod_id"/>
         <result property="regionSwitch" column="region_switch"/>
@@ -22,7 +22,7 @@
         <result property="weightSwitch" column="weight_switch"/>
 
         <!-- 关联紧急响应配置 -->
-        <association property="prodEmergencyInfoVO" javaType="com.tashow.cloud.product.vo.prodemergencyresponse.ProdEmergencyInfoVO">
+        <association property="prodEmergencyInfoVO" javaType="com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO">
             <id property="id" column="erc_record_id"/>
             <result property="prodId" column="erc_prod_id"/>
             <result property="responseTimeSlots" column="response_time_slots"/>
@@ -31,7 +31,7 @@
             <result property="blackHappy" column="black_happy"/>
             <result property="blackWeekend" column="black_weekend"/>
             <!-- 嵌套集合：紧急响应时间区间 -->
-            <collection property="prodEmergencyResponseIntervalsList" ofType="com.tashow.cloud.product.dto.ProdEmergencyResponseIntervalsDO">
+            <collection property="prodEmergencyResponseIntervalsList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO">
                 <id property="id" column="eri_record_id"/>
                 <result property="configId" column="eri_config_id"/>
                 <result property="modeName" column="mode_name"/>
@@ -42,7 +42,7 @@
             </collection>
         </association>
 
-        <association property="prodReservationConfig" javaType="com.tashow.cloud.product.dto.ProdReservationConfigDO">
+        <association property="prodReservationConfig" javaType="com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO">
             <id property="id" column="rc_record_id"/>
             <result property="prodId" column="rc_prod_id"/>
             <result property="reservationTimeSlots" column="rc_reservation_time_slots"/>
@@ -60,7 +60,7 @@
         </association>
 
         <!-- 映射接单上限配置 (productOrderLimitVO) -->
-        <association property="productOrderLimitVO" javaType="com.tashow.cloud.product.dto.ProductOrderLimitDO">
+        <association property="productOrderLimitVO" javaType="com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO">
             <id property="id" column="ol_record_id"/>
             <result property="prodId" column="ol_prod_id"/>
             <result property="limitUnit" column="ol_limit_unit"/>
@@ -69,15 +69,20 @@
 
         <!-- 2. 所有 association 放在前面 -->
         <!-- 映射服务区域配置 (prodServiceAreasInfo) -->
-        <association property="prodServiceAreasInfo" javaType="com.tashow.cloud.product.vo.prodserviceareas.ProdServiceAreasInfoVO">
+        <association property="prodServiceAreasInfo" javaType="com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO">
             <id property="id" column="sa_rule_id"/>
             <result property="prodId" column="sa_prod_id"/>
             <result property="ruleType" column="sa_rule_type"/>
             <result property="fee" column="sa_fee"/>
+            <!-- 使用 columnPrefix 区分多个 area_name -->
+            <collection property="areaNameList" ofType="string">
+                <result column="sa_area_name"/> <!-- 每行一个 area_name -->
+            </collection>
         </association>
 
+
         <!--  新增：映射体重区间价格配置列表 (prodWeightConfigList) -->
-        <collection property="prodWeightConfig" ofType="com.tashow.cloud.product.dto.ProdWeightRangePricesDO">
+        <collection property="prodWeightConfig" ofType="com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO">
             <id property="id" column="wrp_record_id"/>
             <result property="prodId" column="wrp_prod_id"/>
             <result property="weightRange" column="wrp_weight_range"/> <!-- 注意：数据库列是 weight_range -->
@@ -90,7 +95,7 @@
         </collection>
 
         <!-- 新增：映射特殊日期规则配置列表 (prodAdditionalFeePeriodsList) -->
-        <collection property="prodAdditionalFeePeriodsList" ofType="com.tashow.cloud.product.dto.ProdAdditionalFeePeriodsDO">
+        <collection property="prodAdditionalFeePeriodsList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO">
             <id property="id" column="afp_record_id"/>
             <result property="prodId" column="afp_prod_id"/>
             <result property="name" column="afp_name"/>
@@ -101,7 +106,7 @@
         </collection>
 
         <!-- 新增：映射特殊时段规则配置列表 (ProdAdditionalFeeDatesList) -->
-        <collection property="prodAdditionalFeeDatesList" ofType="com.tashow.cloud.product.dto.ProdAdditionalFeeDatesDO">
+        <collection property="prodAdditionalFeeDatesList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO">
             <id property="id" column="afd_record_id"/>
             <result property="prodId" column="afd_prod_id"/>
             <result property="name" column="afd_name"/>
@@ -114,15 +119,121 @@
         </collection>
 
         <!-- 映射服务区域地址名称 (areaNameList) -->
-        <collection property="prodServiceAreasInfo.areaNameList" ofType="string">
+        <!--<collection property="prodServiceAreasInfo.areaNameList" ofType="string">
             <result column="sa_area_name"/>
-        </collection>
+        </collection>-->
+
+
+
 
 
     </resultMap>
 
 
-    <select id="getProdPageList" resultType="com.tashow.cloud.product.dto.ProdDO" >
+
+
+    <!-- 结果映射：将数据库查询结果映射到 ProdServiceVO -->
+    <resultMap id="ProdServiceResultInfoMap" type="com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO"> <!-- 确保这是 ProdServiceVO 的正确包名 -->
+        <!-- 商品基本信息映射 -->
+        <id property="prodId" column="prod_id"/>
+        <result property="regionSwitch" column="region_switch"/>
+        <result property="additionalSwitch" column="additional_switch"/>
+        <result property="additionalFeeSwitch" column="additional_fee_switch"/>
+        <result property="emergencySwitch" column="emergency_switch"/>
+        <result property="reservationSwitch" column="reservation_switch"/>
+        <result property="orderLimitSwitch" column="order_limit_switch"/>
+        <result property="weightSwitch" column="weight_switch"/>
+
+        <!-- 关联紧急响应配置 -->
+        <association property="prodEmergencyInfoVO" javaType="com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO">
+            <id property="id" column="erc_record_id"/>
+            <result property="prodId" column="erc_prod_id"/>
+            <result property="responseTimeSlots" column="response_time_slots"/>
+            <result property="blacklistedDates" column="blacklisted_dates"/>
+            <result property="blackAppointDates" column="black_appoint_dates"/>
+            <result property="blackHappy" column="black_happy"/>
+            <result property="blackWeekend" column="black_weekend"/>
+            <!-- 嵌套集合：紧急响应时间区间 -->
+            <collection property="prodEmergencyResponseIntervalsList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO">
+                <id property="id" column="eri_record_id"/>
+                <result property="configId" column="eri_config_id"/>
+                <result property="modeName" column="mode_name"/>
+                <result property="responseHours" column="response_hours"/>
+                <result property="chargeMode" column="charge_mode"/>
+                <result property="floatingPercentage" column="floating_percentage"/>
+                <result property="price" column="price"/>
+            </collection>
+        </association>
+
+        <association property="prodReservationConfig" javaType="com.tashow.cloud.productapi.api.product.dto.ProdReservationConfigDO">
+            <id property="id" column="rc_record_id"/>
+            <result property="prodId" column="rc_prod_id"/>
+            <result property="reservationTimeSlots" column="rc_reservation_time_slots"/>
+            <result property="advanceHours" column="rc_advance_hours"/>
+            <result property="reservationDateRange" column="rc_reservation_date_range"/>
+            <result property="allowChange" column="rc_allow_change"/>
+            <result property="changeTimeRule" column="rc_change_time_rule"/>
+            <result property="maxChangeTimes" column="rc_max_change_times"/>
+            <result property="blacklistedDates" column="rc_blacklisted_dates"/>
+            <result property="isBlacklisted" column="rc_is_blacklisted"/>
+            <result property="blackAppointDates" column="rc_black_appoint_dates"/>
+            <result property="isBlackAppoint" column="rc_is_black_appoint"/>
+            <result property="blackHappy" column="rc_black_happy"/>
+            <result property="blackWeekend" column="rc_black_weekend"/>
+        </association>
+
+        <!-- 映射接单上限配置 (productOrderLimitVO) -->
+        <association property="productOrderLimitVO" javaType="com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO">
+            <id property="id" column="ol_record_id"/>
+            <result property="prodId" column="ol_prod_id"/>
+            <result property="limitUnit" column="ol_limit_unit"/>
+            <result property="maxOrders" column="ol_max_orders"/>
+        </association>
+
+
+        <!--  新增：映射体重区间价格配置列表 (prodWeightConfigList) -->
+        <collection property="prodWeightConfig" ofType="com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO">
+            <id property="id" column="wrp_record_id"/>
+            <result property="prodId" column="wrp_prod_id"/>
+            <result property="weightRange" column="wrp_weight_range"/> <!-- 注意：数据库列是 weight_range -->
+            <result property="price" column="wrp_price"/>
+            <result property="isEnabled" column="wrp_is_enabled"/>
+            <!-- <result property="createTime" column="wrp_create_time"/> -->
+            <!-- <result property="updateTime" column="wrp_update_time"/> -->
+            <!-- <result property="creator" column="wrp_creator"/> -->
+            <!-- <result property="updater" column="wrp_updater"/> -->
+        </collection>
+
+        <!-- 新增：映射特殊日期规则配置列表 (prodAdditionalFeePeriodsList) -->
+        <collection property="prodAdditionalFeePeriodsList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO">
+            <id property="id" column="afp_record_id"/>
+            <result property="prodId" column="afp_prod_id"/>
+            <result property="name" column="afp_name"/>
+            <result property="specialTimeSlots" column="afp_special_time_slots"/>
+            <result property="chargeMode" column="afp_charge_mode"/>
+            <result property="price" column="afp_price"/>
+            <result property="floatingPercentage" column="afp_floating_percentage"/>
+        </collection>
+
+        <!-- 新增：映射特殊时段规则配置列表 (ProdAdditionalFeeDatesList) -->
+        <collection property="prodAdditionalFeeDatesList" ofType="com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO">
+            <id property="id" column="afd_record_id"/>
+            <result property="prodId" column="afd_prod_id"/>
+            <result property="name" column="afd_name"/>
+            <result property="dateType" column="afd_date_type"/>
+            <result property="customTimeSlots" column="afd_custom_time_slots"/>
+            <result property="specificDates" column="afd_specific_dates"/>
+            <result property="chargeMode" column="afd_charge_mode"/>
+            <result property="price" column="afd_price"/>
+            <result property="isEnabled" column="afd_is_enabled"/>
+        </collection>
+
+    </resultMap>
+
+
+
+
+    <select id="getProdPageList" resultType="com.tashow.cloud.productapi.api.product.dto.ProdDO" >
         select * from tz_prod
     </select>
 
@@ -264,4 +375,131 @@
         ORDER BY p.prod_id
     </select>
 
+
+
+
+    <!-- 动态SQL查询商品列表及其服务配置 (返回 List<ProdServiceVO>) -->
+    <!-- 用于列表页，可根据开关动态决定是否关联紧急响应信息以优化性能 -->
+    <select id="selectProdServiceInfo" parameterType="map" resultMap="ProdServiceResultInfoMap">
+        SELECT
+        p.emergency_switch,
+        p.additional_switch,
+        p.additional_fee_switch,
+        p.reservation_switch,
+        p.order_limit_switch,
+        p.weight_switch,
+        <!-- 只有当 emergencySwitch 开启时，才查询紧急响应相关字段 -->
+        <if test="emergencySwitch != null and emergencySwitch == 1">
+            erc.id AS erc_record_id,
+            erc.prod_id AS erc_prod_id,
+            erc.response_time_slots,
+            erc.blacklisted_dates,
+            erc.black_appoint_dates,
+            erc.black_happy,
+            erc.black_weekend,
+            erc.create_time AS erc_create_time,
+            erc.update_time AS erc_update_time,
+            erc.creator AS erc_creator,
+            erc.updater AS erc_updater,
+            erc.deleted AS erc_deleted,
+            eri.id AS eri_record_id,
+            eri.config_id AS eri_config_id,
+            eri.mode_name,
+            eri.response_hours,
+            eri.charge_mode,
+            eri.floating_percentage,
+            eri.price,
+            eri.create_time AS eri_create_time,
+            eri.update_time AS eri_update_time,
+            eri.creator AS eri_creator,
+            eri.updater AS eri_updater,
+            eri.deleted AS eri_deleted,
+        </if>
+        <!-- 只有当 additionalFeeSwitch 开启时，才查询特殊日期规则相关字段 -->
+        <if test="additionalFeeSwitch != null and additionalFeeSwitch == 1">
+            afp.id AS afp_record_id,
+            afp.prod_id AS afp_prod_id,
+            afp.name AS afp_name,
+            afp.special_time_slots AS afp_special_time_slots,
+            afp.charge_mode AS afp_charge_mode,
+            afp.price AS afp_price,
+            afp.floating_percentage AS afp_floating_percentage,
+        </if>
+        <!--  只有当 additionalSwitch 开启时，才查询特殊时段规则相关字段 -->
+        <if test="additionalSwitch != null and additionalSwitch == 1">
+            afd.id AS afd_record_id,
+            afd.prod_id AS afd_prod_id,
+            afd.name AS afd_name,
+            afd.date_type AS afd_date_type,
+            afd.custom_time_slots AS afd_custom_time_slots,
+            afd.specific_dates AS afd_specific_dates,
+            afd.charge_mode AS afd_charge_mode,
+            afd.price AS afd_price,
+            afd.is_enabled AS afd_is_enabled,
+            afd.create_time AS afd_create_time,
+            afd.update_time AS afd_update_time,
+            afd.creator AS afd_creator,
+            afd.updater AS afd_updater,
+            afd.deleted AS afd_deleted,
+        </if>
+        <!-- 只有当 reservationSwitch 开启时，才查询预约配置相关字段 -->
+        <if test="reservationSwitch != null and reservationSwitch == 1">
+            rc.id AS rc_record_id,
+            rc.prod_id AS rc_prod_id,
+            rc.reservation_time_slots AS rc_reservation_time_slots,
+            rc.advance_hours AS rc_advance_hours,
+            rc.reservation_date_range AS rc_reservation_date_range,
+            rc.allow_change AS rc_allow_change,
+            rc.change_time_rule AS rc_change_time_rule,
+            rc.max_change_times AS rc_max_change_times,
+            rc.blacklisted_dates AS rc_blacklisted_dates,
+            rc.is_blacklisted AS rc_is_blacklisted,
+            rc.black_appoint_dates AS rc_black_appoint_dates,
+            rc.is_black_appoint AS rc_is_black_appoint,
+            rc.black_happy AS rc_black_happy,
+            rc.black_weekend AS rc_black_weekend,
+        </if>
+        <!--  只有当 orderLimitSwitch 开启时，才查询接单上限配置相关字段 -->
+        <if test="orderLimitSwitch != null and orderLimitSwitch == 1">
+            ol.id AS ol_record_id,
+            ol.prod_id AS ol_prod_id,
+            ol.limit_unit AS ol_limit_unit,
+            ol.max_orders AS ol_max_orders,
+        </if>
+        <!-- 只有当 weightSwitch 开启时，才查询体重区间价格相关字段 -->
+        <if test="weightSwitch != null and weightSwitch == 1">
+            wrp.id AS wrp_record_id,
+            wrp.prod_id AS wrp_prod_id,
+            wrp.weight_range AS wrp_weight_range,
+            wrp.price AS wrp_price,
+            wrp.is_enabled AS wrp_is_enabled,
+        </if>
+        p.prod_id
+        FROM
+        tz_prod p
+        <!-- 只有当 emergencySwitch 开启时才进行 LEFT JOIN -->
+        <if test="emergencySwitch != null and emergencySwitch == 1">
+            LEFT JOIN tz_prod_emergency_response erc ON p.prod_id = erc.prod_id AND erc.deleted = 0
+            LEFT JOIN tz_prod_emergency_response_intervals eri ON erc.id = eri.config_id AND eri.deleted = 0
+        </if>
+        <if test="additionalFeeSwitch != null and additionalFeeSwitch == 1">
+            LEFT JOIN tz_prod_additional_fee_periods afp ON p.prod_id = afp.prod_id AND afp.deleted = 0
+        </if>
+        <if test="additionalSwitch != null and additionalSwitch == 1">
+            LEFT JOIN tz_prod_additional_fee_dates afd ON p.prod_id = afd.prod_id AND afd.deleted = 0
+        </if>
+        <if test="reservationSwitch != null and reservationSwitch == 1">
+            LEFT JOIN tz_prod_reservation_config rc ON p.prod_id = rc.prod_id AND rc.deleted = 0
+        </if>
+        <if test="orderLimitSwitch != null and orderLimitSwitch == 1">
+            LEFT JOIN tz_product_order_limit ol ON p.prod_id = ol.prod_id AND ol.deleted = 0
+        </if>
+        <if test="weightSwitch != null and weightSwitch == 1">
+            LEFT JOIN tz_prod_weight_range_prices wrp ON p.prod_id = wrp.prod_id AND wrp.deleted = 0
+        </if>
+        where  p.deleted = 0
+        AND p.prod_id = #{prodId}
+        ORDER BY p.prod_id
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml
index 94f4c50..76f5c0d 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdPropMapper.xml
@@ -8,7 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-    <select id="getProdPropByPropNameAndShopId" resultType="com.tashow.cloud.product.dto.ProdPropDO">
+    <select id="getProdPropByPropNameAndShopId" resultType="com.tashow.cloud.productapi.api.product.dto.ProdPropDO">
         select * from tz_prod_prop where prop_name = #{propName} and prod_id = #{prodId} and rule = #{rule}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml
index 6dd292a..746575d 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuMapper.xml
@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-    <select id="getSkuRecycleBinPageList" resultType="com.tashow.cloud.product.vo.sku.SkuRecycleBinVO" >
+    <select id="getSkuRecycleBinPageList" resultType="com.tashow.cloud.productapi.api.product.vo.sku.SkuRecycleBinVO" >
         select sku_id, properties, delete_time from tz_sku where prod_id = #{prodId} and deleted = 1
         <if test="properties != null and properties != ''">
             and properties like concat('%', #{properties}, '%')
@@ -17,7 +17,7 @@
     </select>
 
 
-    <select id="getSkuListByName" resultType="com.tashow.cloud.product.dto.SkuDO" >
+    <select id="getSkuListByName" resultType="com.tashow.cloud.productapi.api.product.dto.SkuDO" >
         select sku_id, properties, delete_time,deleted from tz_sku
         <if test="properties != null and properties != ''">
             and properties like concat('%', #{propertiesName}, '%')
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuServicesFormMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuServicesFormMapper.xml
index a2ba040..cc2896a 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuServicesFormMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/SkuServicesFormMapper.xml
@@ -10,7 +10,7 @@
      -->
 
     <!-- 结果映射：将多表查询结果映射到 SkuServiceExtendVO -->
-    <resultMap id="SkuServiceExtendResultMap" type="com.tashow.cloud.product.vo.sku.SkuServiceExtendVO">
+    <resultMap id="SkuServiceExtendResultMap" type="com.tashow.cloud.productapi.api.product.vo.sku.SkuServiceExtendVO">
         <!-- 主表字段 -->
         <id property="id" column="id"/>
         <result property="name" column="name"/>
@@ -18,19 +18,19 @@
         <result property="isEnabled" column="is_enabled"/>
 
         <!-- 嵌套集合：服务详情 -->
-        <collection property="skuServiceDetailsDOList" ofType="com.tashow.cloud.product.dto.SkuServiceDetailsDO"
+        <collection property="skuServiceDetailsDOList" ofType="com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO"
                     column="id" select="selectDetailsByServiceId" />
 
         <!-- 嵌套集合：服务物料 -->
-        <collection property="skuServiceMaterialDOList" ofType="com.tashow.cloud.product.dto.SkuServiceMaterialDO"
+        <collection property="skuServiceMaterialDOList" ofType="com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO"
                     column="id" select="selectMaterialByServiceId" />
 
         <!-- 嵌套集合：服务遗体运输 -->
-        <collection property="skuServiceTransportDOList" ofType="com.tashow.cloud.product.dto.SkuServiceTransportDO"
+        <collection property="skuServiceTransportDOList" ofType="com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO"
                     column="id" select="selectTransportByServiceId" />
 
         <!-- 嵌套集合：服务交付方式 -->
-        <collection property="skuServiceDeliverDOList" ofType="com.tashow.cloud.product.dto.SkuServiceDeliverDO"
+        <collection property="skuServiceDeliverDOList" ofType="com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO"
                     column="id" select="selectDeliverByServiceId" />
     </resultMap>
 
@@ -46,7 +46,7 @@
     </select>
 
     <!-- 子查询：根据 service_id 查询服务详情 -->
-    <select id="selectDetailsByServiceId" resultType="com.tashow.cloud.product.dto.SkuServiceDetailsDO">
+    <select id="selectDetailsByServiceId" resultType="com.tashow.cloud.productapi.api.product.dto.SkuServiceDetailsDO">
         SELECT id, service_id, pic, name, price, is_charge, is_default, type, adress,
                trigger_name, trigger_id, is_parallel, describe_content,
                create_time, update_time, creator, updater, deleted
@@ -55,7 +55,7 @@
     </select>
 
     <!-- 子查询：根据 service_id 查询服务物料 -->
-    <select id="selectMaterialByServiceId" resultType="com.tashow.cloud.product.dto.SkuServiceMaterialDO">
+    <select id="selectMaterialByServiceId" resultType="com.tashow.cloud.productapi.api.product.dto.SkuServiceMaterialDO">
         SELECT id, service_id, name, describe_content,
                create_time, update_time, creator, updater, deleted
         FROM tz_sku_service_material
@@ -63,7 +63,7 @@
     </select>
 
     <!-- 子查询：根据 service_id 查询服务遗体运输 -->
-    <select id="selectTransportByServiceId" resultType="com.tashow.cloud.product.dto.SkuServiceTransportDO">
+    <select id="selectTransportByServiceId" resultType="com.tashow.cloud.productapi.api.product.dto.SkuServiceTransportDO">
         SELECT id, service_id, contacts, address, province, city, area, tel,
                create_time, update_time, creator, updater, deleted
         FROM tz_sku_service_transport
@@ -71,7 +71,7 @@
     </select>
 
     <!-- 子查询：根据 service_id 查询服务交付方式 -->
-    <select id="selectDeliverByServiceId" resultType="com.tashow.cloud.product.dto.SkuServiceDeliverDO">
+    <select id="selectDeliverByServiceId" resultType="com.tashow.cloud.productapi.api.product.dto.SkuServiceDeliverDO">
         SELECT id, service_id, type, price, is_charge, address, province, city, area, tel,
                create_time, update_time, creator, updater, deleted
         FROM tz_sku_service_deliver
diff --git a/tashow-module/tashow-module-system/pom.xml b/tashow-module/tashow-module-system/pom.xml
index 65c03b2..4326422 100644
--- a/tashow-module/tashow-module-system/pom.xml
+++ b/tashow-module/tashow-module-system/pom.xml
@@ -155,6 +155,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
         </dependency>
+       <!-- <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-product-api</artifactId>
+            <version>${revision}</version>
+        </dependency>-->
 
     </dependencies>
 
diff --git a/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java
index 04a5497..a36593e 100644
--- a/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java
+++ b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java
@@ -2,6 +2,7 @@ package com.tashow.cloud.system;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @SpringBootApplication
 @EnableAsync // 开启异步
+//@EnableFeignClients(basePackages = "com.tashow.cloud.productapi.api")
 public class SystemServerApplication {
 
     public static void main(String[] args) {
diff --git a/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/prod/CategoryController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/prod/CategoryController.java
new file mode 100644
index 0000000..6d3b203
--- /dev/null
+++ b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/prod/CategoryController.java
@@ -0,0 +1,41 @@
+/*
+package com.tashow.cloud.system.controller.admin.prod;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+
+import com.tashow.cloud.productapi.api.product.CategoryApi;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.tashow.cloud.common.pojo.CommonResult.success;
+
+@RestController
+@RequestMapping("/category")
+@Validated
+public class CategoryController {
+
+    @Resource
+    private CategoryApi categoryService;
+
+    */
+/**
+     * 获取菜单页面的表
+     * @return
+     *//*
+
+
+    @GetMapping("/categoryList")
+    @PermitAll
+    public CommonResult<List<CategoryDto>> categoryList(@RequestParam(value = "grade", required = false) Integer grade,
+                                                        @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                                        @RequestParam(value = "status", required = false) Integer status) {
+       return success(categoryService.categoryList(grade, categoryId, status));
+    }
+
+
+}*/