format

src/main/java/com/gic/plug/web/controller/goods/GoodsCategoryController.java

@@ -33,7 +33,7 @@ public class GoodsCategoryController {
         if (goodsDomainId == null || StringUtils.isBlank(channelCode)) {
             return RestResponse.failure(ErrorCode.UNKNOW_ERROR.getCode(), "参数不全");
         }
-        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listParentAll(channelCode, goodsDomainId);
+        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listParentAll(channelCode, goodsDomainId,null);
         List<CategoryDTO> result = serviceResponse.getResult();
         if (CollectionUtils.isEmpty(result)) {
             return RestResponse.success();
@@ -52,7 +52,7 @@ public class GoodsCategoryController {
         if (specParentId == null || StringUtils.isBlank(channelCode)) {
             return RestResponse.failure(ErrorCode.UNKNOW_ERROR.getCode(), "参数不全");
         }
-        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listChildAll(channelCode, specParentId);
+        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listChildAll(channelCode, specParentId,null);
         List<CategoryDTO> result = serviceResponse.getResult();
         if (CollectionUtils.isEmpty(result)) {
             return RestResponse.success();

src/main/java/com/gic/plug/web/controller/goods/GoodsPropertyController.java

@@ -3,6 +3,7 @@ package com.gic.plug.web.controller.goods;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gic.goods.api.dto.FullPropertyDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -38,7 +39,7 @@ public class GoodsPropertyController {
         arrayList.add(Constant.PROPERTY_TYPE_PERCENT);
         arrayList.add(Constant.PROPERTY_TYPE_NUM);
         arrayList.add(Constant.PROPERTY_TYPE_REAL_NUM);
-        ServiceResponse<Page<PropertyDTO>> serviceResponse = propertyApiService.findPropertyExceptType(currentPage, pageSize, goodsDomainId, arrayList,search);
+        ServiceResponse<Page<FullPropertyDTO>> serviceResponse = propertyApiService.findPropertyExceptType(currentPage, pageSize, goodsDomainId, arrayList,search);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }