项目目录规整

1fcca8a4 · HuAnYing · 4a0d615d · 1fcca8a4 · 1fcca8a4 · 1fcca8a4
Commit 1fcca8a4 authored Jun 05, 2026 by HuAnYing
67 changed files
--- a/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductImageDto.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductImageDto.java
@@ -20,7 +20,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "图片Dto")
-public class CustomProductImageDto implements Serializable {
+public class CustomProductImageDTO implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductInfoDto.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductInfoDto.java
@@ -22,7 +22,7 @@ import java.util.List;
 * @date 2026-06-02 19:07:12
 */
 @Data
-public class CustomProductInfoDto  extends PageRequest implements Serializable {
+public class CustomProductInfoDTO extends PageRequest implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;
@@ -234,7 +234,7 @@ public class CustomProductInfoDto  extends PageRequest implements Serializable {
     * 是否九猫处理
     */
    @Schema(description = "是否九猫处理", example = "")
-    private Boolean processing;
+    private Integer processing;
    /**
     * 
@@ -248,23 +248,23 @@ public class CustomProductInfoDto  extends PageRequest implements Serializable {
    @Schema(description = "模型ID", example = "")
    private Integer diyId;
-    @Schema(description = "商品明细", implementation = ProductChangeDto.class)
+    @Schema(description = "商品明细", implementation = ProductChangeDTO.class)
-    private ProductChangeDto productChange;
+    private ProductChangeDTO productChange;
-    @Schema(description = "商品明细", implementation = CustomProductItemDto.class)
+    @Schema(description = "商品明细", implementation = CustomProductItemDTO.class)
-    private List<CustomProductItemDto> productList;
+    private List<CustomProductItemDTO> productList;
-    @Schema(description = "普通属性集合", implementation = CustomProductInfoPropertyDto.class)
+    @Schema(description = "普通属性集合", implementation = CustomProductInfoPropertyDTO.class)
-    private List<CustomProductInfoPropertyDto> normalProperties;
+    private List<CustomProductInfoPropertyDTO> normalProperties;
-    @Schema(description = "sku属性集合", implementation = CustomProductInfoPropertyDto.class)
+    @Schema(description = "sku属性集合", implementation = CustomProductInfoPropertyDTO.class)
-    private List<CustomProductInfoPropertyDto> skuProperties;
+    private List<CustomProductInfoPropertyDTO> skuProperties;
-    @Schema(description = "商品图片集合", implementation = CustomProductImageDto.class)
+    @Schema(description = "商品图片集合", implementation = CustomProductImageDTO.class)
-    private List<CustomProductImageDto> imageList;
+    private List<CustomProductImageDTO> imageList;
-    @Schema(description = "尺码图片集合", implementation = CustomProductImageDto.class)
+    @Schema(description = "尺码图片集合", implementation = CustomProductImageDTO.class)
-    private List<CustomProductImageDto> sizeList;
+    private List<CustomProductImageDTO> sizeList;
 }
--- a/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductInfoPropertyDto.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductInfoPropertyDto.java
@@ -18,12 +18,12 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "属性dto")
-public class CustomProductInfoPropertyDto implements Serializable {
+public class CustomProductInfoPropertyDTO implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;
    /**
-     * 
+     *
     */
    @Schema(description = "")
    private Integer id;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductItemDto.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductItemDto.java
@@ -22,7 +22,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "skuItem Dto")
-public class CustomProductItemDto implements Serializable {
+public class CustomProductItemDTO implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/ProductChangeDto.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/ProductChangeDto.java
@@ -14,12 +14,12 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "商品变更Dto")
-public class ProductChangeDto implements Serializable {
+public class ProductChangeDTO implements Serializable {
-    @Schema(description = "添加集合", implementation = CustomProductItemDto.class)
+    @Schema(description = "添加集合", implementation = CustomProductItemDTO.class)
-    private List<CustomProductItemDto> addList;
+    private List<CustomProductItemDTO> addList;
-    @Schema(description = "修改集合", implementation = CustomProductItemDto.class)
+    @Schema(description = "修改集合", implementation = CustomProductItemDTO.class)
-    private List<CustomProductItemDto> updateList;
+    private List<CustomProductItemDTO> updateList;
    @Schema(description = "删除集合", implementation = Integer.class)
    private List<Integer> removeList;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/common/BaseCategoryInfoService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/common/BaseCategoryInfoService.java
 package com.jomalls.custom.app.service.impl.common;
+import com.jomalls.custom.app.vo.product.BaseCategoryInfoVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.List;
+@Slf4j
+@Service
+@RequiredArgsConstructor
 public class BaseCategoryInfoService {
+    private static final String GET_TREE_URL = "/api/manage/rest/baseCategoryInfo/tree_list";
+    private static final String GET_BY_IDS_URL = "/api/manage/rest/baseCategoryInfo/getDataByIds";
+    private static final String GET_BY_ID_URL = "/api/manage/rest/baseCategoryInfo/get";
+    private static final String GET_TREE_LIST_URL = "/api/manage/rest/baseCategoryInfo/getDataByIds";
+    private static final String GET_ALL_LIST_URL = "/api/manage/rest/baseCategoryInfo/all_list";
+    /**
+     * 获取类别树
+     */
+    public void getTree() {
+    }
+    public void getByIds(String ids) {
+    }
+    /**
+     * 获取带有风格属性的树形结构
+     */
+    public void getTreeList() {
+    }
+    /**
+     * 根据id获取
+     * @param id
+     */
+    public void getById(Integer id) {
+    }
+    /**
+     *查询所有类别
+     */
+    public List<BaseCategoryInfoVO> getAllList() {
+        return null;
+    }
 }
--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductBlacklistServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductBlacklistServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
-import com.jomalls.custom.app.vo.CustomProductBlacklistVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
 import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCnRemarkServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCnRemarkServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkVO;
 import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCraftRelServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCraftRelServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductCraftRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductCraftRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelVO;
 import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductDiyUserRelServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductDiyUserRelServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelVO;
 import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceIntervalRelServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceIntervalRelServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
 import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceRelServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceRelServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelVO;
 import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductImageServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductImageServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductImagePageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImagePageVO;
-import com.jomalls.custom.app.vo.CustomProductImageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImageVO;
 import com.jomalls.custom.app.service.product.CustomProductImageService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoPropertyServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoPropertyServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyPageVO;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyVO;
 import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoServiceImpl.java
@@ -2,16 +2,18 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.dto.product.CustomProductInfoDto;
+import com.jomalls.custom.app.dto.product.CustomProductInfoDTO;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductInfoVO;
+import com.jomalls.custom.app.service.impl.common.BaseCategoryInfoService;
+import com.jomalls.custom.app.vo.product.BaseCategoryInfoVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoVO;
 import com.jomalls.custom.app.service.product.CustomProductInfoService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;
 import com.jomalls.custom.domain.service.CustomProductInfoDomainService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,14 +29,12 @@ import java.util.stream.Collectors;
 */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class CustomProductInfoServiceImpl implements CustomProductInfoService {
    private final CustomProductInfoDomainService customProductInfoDomainService;
+    private final BaseCategoryInfoService baseCategoryInfoService;
-    @Autowired
-    public CustomProductInfoServiceImpl(CustomProductInfoDomainService customProductInfoDomainService) {
-        this.customProductInfoDomainService = customProductInfoDomainService;
-    }
    @Override
    public List<CustomProductInfoVO> list(CustomProductInfoVO customProductInfoVO) {
@@ -45,14 +45,56 @@ public class CustomProductInfoServiceImpl implements CustomProductInfoService {
    }
    @Override
-    public IPage<CustomProductInfoVO> pageList(CustomProductInfoDto param) {
+    public IPage<CustomProductInfoVO> pageList(CustomProductInfoDTO param) {
        CustomAsserts.nonNull(param, "分页查询参数不能为空");
        QueryWrapper<CustomProductInfoEntity> queryWrapper = new QueryWrapper<>();
+        toQueryWrapper(param,queryWrapper);
        // TODO 根据业务条件组装入参
        IPage<CustomProductInfoEntity> page = customProductInfoDomainService.selectPage(queryWrapper, param);
        return page.convert(e -> BeanMapper.mapper().convert(e, CustomProductInfoVO.class));
    }
+    private void toQueryWrapper(CustomProductInfoDTO param, QueryWrapper<CustomProductInfoEntity> queryWrapper) {
+        if(param.getCategory_id() !=null ){
+            // 获取所有分类列表
+            List<BaseCategoryInfoVO> cateList = baseCategoryInfoService.getAllList();
+            // 查找匹配的分类
+            BaseCategoryInfoVO cate = cateList.stream()
+                    .filter(c -> c.getId().equals(param.getCategory_id()))
+                    .findFirst()
+                    .orElseThrow(() -> new ServiceException("不存在该类别"));
+            // 构建 pids
+            String pids = String.valueOf(cate.getId());
+            if (cate.getPids() != null && !cate.getPids().isEmpty()) {
+                pids = cate.getPids() + "," + pids;
+            }
+            // 筛选子分类
+            String finalPids = pids;
+            List<Integer> cateIds = cateList.stream()
+                    .filter(item -> {
+                        String itemPids = item.getPids();
+                        return finalPids.equals(itemPids) ||
+                                (itemPids != null && itemPids.startsWith(finalPids + ","));
+                    })
+                    .map(BaseCategoryInfoVO::getId)
+                    .collect(Collectors.toList());
+            // 添加当前分类ID
+            cateIds.add(cate.getId());
+            // 设置参数
+            queryWrapper.in("category_id",cateIds);
+        }
+        if (param.getProcessing() != null || param.getProcessing() == 0) {
+            if (param.getProcessing() == 1) {
+                queryWrapper.eq("processing",1);
+            } else if (param.getProcessing() == 0) {
+                queryWrapper.eq("processing",0);
+            } else if (param.getProcessing() == 2) {
+                queryWrapper.isNull("processing");
+            }
+        }
+        queryWrapper.orderByDesc("id");
+    }
    @Override
    public CustomProductInfoVO info(Integer id) {
        CustomAsserts.nonNull(id, "主键id不能为空");

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductItemServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductItemServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductItemPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemPageVO;
-import com.jomalls.custom.app.vo.CustomProductItemVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemVO;
 import com.jomalls.custom.app.service.product.CustomProductItemService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductRemarkServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductRemarkServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkVO;
 import com.jomalls.custom.app.service.product.CustomProductRemarkService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductWarehouseRelServiceImpl.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductWarehouseRelServiceImpl.java
@@ -3,8 +3,8 @@ package com.jomalls.custom.app.service.impl.product;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
 import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductBlacklistService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductBlacklistService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
-import com.jomalls.custom.app.vo.CustomProductBlacklistVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCnRemarkService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCnRemarkService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCraftRelService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCraftRelService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductCraftRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductCraftRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductDiyUserRelService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductDiyUserRelService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceIntervalRelService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceIntervalRelService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceRelService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceRelService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductImageService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductImageService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductImagePageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImagePageVO;
-import com.jomalls.custom.app.vo.CustomProductImageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImageVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoPropertyService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoPropertyService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyPageVO;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.dto.product.CustomProductInfoDto;
+import com.jomalls.custom.app.dto.product.CustomProductInfoDTO;
-import com.jomalls.custom.app.vo.CustomProductInfoVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoVO;
 import java.util.List;
@@ -28,7 +28,7 @@ public interface CustomProductInfoService {
     * @param param 分页入参model
     * @return 分页对象
     */
-    IPage<CustomProductInfoVO> pageList(CustomProductInfoDto param);
+    IPage<CustomProductInfoVO> pageList(CustomProductInfoDTO param);
    /**
     * 根据id查询详情

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductItemService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductItemService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductItemPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemPageVO;
-import com.jomalls.custom.app.vo.CustomProductItemVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductRemarkService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductRemarkService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductWarehouseRelService.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductWarehouseRelService.java
 package com.jomalls.custom.app.service.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
 import java.util.List;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/BaseCategoryInfoVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/BaseCategoryInfoVO.java
+package com.jomalls.custom.app.vo.product;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 商品分类
+ * @author zhengcunwen
+ * @since 2019-09-02
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "商品分类")
+public class BaseCategoryInfoVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer id;
+    @Schema(description="类别中文名")
+    private String name;
+    @Schema(description="类别英文名称")
+    private String enname;
+    @Schema(description="pid")
+    private Integer pid;
+    @Schema(description="pids")
+    private String pids;
+    @Schema(description="备注")
+    private String remark;
+    private Integer deep;
+    @Schema(description="排序")
+    private Integer sort;
+    private String enpath;
+    private String cnpath;
+    private Boolean leaf;
+    private Date createTime;
+}
--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImagePageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImagePageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelPageVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelPageVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

--- a/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelVO.java
+++ b/custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelVO.java
-package com.jomalls.custom.app.vo;
+package com.jomalls.custom.app.vo.product;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductBlacklistController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductBlacklistController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
-import com.jomalls.custom.app.vo.CustomProductBlacklistVO;
+import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
 import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCnRemarkController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCnRemarkController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductCnRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductCnRemarkVO;
 import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCraftRelController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCraftRelController.java
@@ -2,8 +2,8 @@ package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.annotation.RequiresPermissions;
-import com.jomalls.custom.app.vo.CustomProductCraftRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductCraftRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductCraftRelVO;
 import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductDiyUserRelController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductDiyUserRelController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductDiyUserRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelVO;
 import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceIntervalRelController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceIntervalRelController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
 import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceRelController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceRelController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelVO;
 import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductImageController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductImageController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductImagePageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImagePageVO;
-import com.jomalls.custom.app.vo.CustomProductImageVO;
+import com.jomalls.custom.app.vo.product.CustomProductImageVO;
 import com.jomalls.custom.app.service.product.CustomProductImageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.dto.product.CustomProductInfoDto;
+import com.jomalls.custom.app.dto.product.CustomProductInfoDTO;
-import com.jomalls.custom.app.vo.CustomProductInfoVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoVO;
 import com.jomalls.custom.app.service.product.CustomProductInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -49,8 +49,8 @@ public class CustomProductInfoController {
     * @return 分页对象
     */
    @Operation(summary = "分页列表接口", description = "根据条件查询分页列表接口")
-    @RequestMapping(value = "/pageList", method = RequestMethod.POST)
+    @RequestMapping(value = "/page", method = RequestMethod.POST)
-    public IPage<CustomProductInfoVO> pageList(@RequestBody CustomProductInfoDto param) {
+    public IPage<CustomProductInfoVO> pageList(@RequestBody CustomProductInfoDTO param) {
        return customProductInfoService.pageList(param);
    }

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoPropertyController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoPropertyController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyPageVO;
-import com.jomalls.custom.app.vo.CustomProductInfoPropertyVO;
+import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyVO;
 import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductItemController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductItemController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductItemPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemPageVO;
-import com.jomalls.custom.app.vo.CustomProductItemVO;
+import com.jomalls.custom.app.vo.product.CustomProductItemVO;
 import com.jomalls.custom.app.service.product.CustomProductItemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductRemarkController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductRemarkController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductRemarkPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkPageVO;
-import com.jomalls.custom.app.vo.CustomProductRemarkVO;
+import com.jomalls.custom.app.vo.product.CustomProductRemarkVO;
 import com.jomalls.custom.app.service.product.CustomProductRemarkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

--- a/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductWarehouseRelController.java
+++ b/custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductWarehouseRelController.java
 package com.jomalls.custom.webapp.controller.product;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
+import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
 import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;