Merge remote-tracking branch 'origin/master'

build_order.sh

@@ -0,0 +1 @@
+mvn clean package -pl order/order-application -am -DskipTests

build_product.sh

@@ -0,0 +1 @@
+mvn clean package -pl product/product-application -am -DskipTests

product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java

@@ -77,7 +77,7 @@ public class AdminsProductCategoryController {
         // 创建商品分类
         CommonResult<ProductCategoryBO> result = productCategoryService.addProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), productCategoryAddDTO);
         // 返回结果
-        return ProductCategoryConvert.INSTANCE.convert(result);
+        return ProductCategoryConvert.INSTANCE.convert2(result);
     }
 
     @PostMapping("/update")

product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java

@@ -19,10 +19,13 @@ public interface ProductCategoryConvert {
     @Mappings({})
     UsersProductCategoryVO convertToVO(ProductCategoryBO category);
 
+    @Mappings({})
     List<UsersProductCategoryVO> convertToVO(List<ProductCategoryBO> categoryList);
 
+    @Mappings({})
     AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category);
 
-    CommonResult<AdminsProductCategoryVO> convert(CommonResult<ProductCategoryBO> result);
+    @Mappings({})
+    CommonResult<AdminsProductCategoryVO> convert2(CommonResult<ProductCategoryBO> result);
 
 }

product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java

@@ -30,9 +30,9 @@ public interface ProductAttrConvert {
     @Mappings({})
     List<ProductAttrSimpleBO> convert3(List<ProductAttrDO> attrs);
 
-//    @Mappings({})
+    @Mappings({})
-//    ProductAttrValueSimpleBO convert3(ProductAttrValueDO value);
+    ProductAttrValueSimpleBO convert3(ProductAttrValueDO value); // 保证 convert4 能够映射到这个方法
-//
+
     @Mappings({})
     List<ProductAttrValueSimpleBO> convert4(List<ProductAttrValueDO> values);