Merge branch 'master' into dev_pfh

custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductInfoDto.java

 package com.jomalls.custom.app.dto.product;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Digits;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
-import org.aspectj.bridge.IMessage;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 
@@ -24,7 +22,7 @@ import java.util.List;
  * @date 2026-06-02 19:07:12
  */
 @Data
-public class CustomProductInfoDto implements Serializable {
+public class CustomProductInfoDto  extends PageRequest implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
@@ -65,7 +63,7 @@ public class CustomProductInfoDto implements Serializable {
      */
     @Schema(description = "商品类别ID", example = "")
     @NotBlank(message = "商品类别不能为空")
-    private Integer categoryId;
+    private Integer category_id;
 
     /**
      * 重量kg
@@ -250,8 +248,8 @@ public class CustomProductInfoDto implements Serializable {
     @Schema(description = "模型ID", example = "")
     private Integer diyId;
 
-   // @Schema(description = "商品明细", implementation = ProductChangeDTO.class)
-   // private ProductChangeDTO productChange;
+    @Schema(description = "商品明细", implementation = ProductChangeDto.class)
+    private ProductChangeDto productChange;
 
     @Schema(description = "商品明细", implementation = CustomProductItemDto.class)
     private List<CustomProductItemDto> productList;

custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/CustomProductItemDto.java

@@ -21,7 +21,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(description = "VO")
+@Schema(description = "skuItem Dto")
 public class CustomProductItemDto implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;

custom-server-app/src/main/java/com/jomalls/custom/app/dto/product/ProductChangeDto.java

+package com.jomalls.custom.app.dto.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.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "商品变更Dto")
+public class ProductChangeDto implements Serializable {
+    @Schema(description = "添加集合", implementation = CustomProductItemDto.class)
+    private List<CustomProductItemDto> addList;
+
+    @Schema(description = "修改集合", implementation = CustomProductItemDto.class)
+    private List<CustomProductItemDto> updateList;
+
+    @Schema(description = "删除集合", implementation = Integer.class)
+    private List<Integer> removeList;
+}

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/common/BaseCategoryInfoService.java

+package com.jomalls.custom.app.service.impl.common;
+
+public class BaseCategoryInfoService {
+
+}

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductBlacklistServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductBlacklistServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+package com.jomalls.custom.app.service.impl.product;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;
 import com.jomalls.custom.app.vo.CustomProductBlacklistVO;
-import com.jomalls.custom.app.service.CustomProductBlacklistService;
+import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductBlacklistEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity;
 import com.jomalls.custom.domain.service.CustomProductBlacklistDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductCnRemarkServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCnRemarkServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductCnRemarkVO;
-import com.jomalls.custom.app.service.CustomProductCnRemarkService;
+import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductCnRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity;
 import com.jomalls.custom.domain.service.CustomProductCnRemarkDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductCraftRelServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductCraftRelServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductCraftRelVO;
-import com.jomalls.custom.app.service.CustomProductCraftRelService;
+import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductCraftRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity;
 import com.jomalls.custom.domain.service.CustomProductCraftRelDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductDiyUserRelServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductDiyUserRelServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductDiyUserRelVO;
-import com.jomalls.custom.app.service.CustomProductDiyUserRelService;
+import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductDiyUserRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity;
 import com.jomalls.custom.domain.service.CustomProductDiyUserRelDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductFactoryPriceIntervalRelServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceIntervalRelServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+package com.jomalls.custom.app.service.impl.product;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
 import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
-import com.jomalls.custom.app.service.CustomProductFactoryPriceIntervalRelService;
+import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceIntervalRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;
 import com.jomalls.custom.domain.service.CustomProductFactoryPriceIntervalRelDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductFactoryPriceRelServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceRelServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductFactoryPriceRelVO;
-import com.jomalls.custom.app.service.CustomProductFactoryPriceRelService;
+import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity;
 import com.jomalls.custom.domain.service.CustomProductFactoryPriceRelDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductImageServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductImageServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductImageVO;
-import com.jomalls.custom.app.service.CustomProductImageService;
+import com.jomalls.custom.app.service.product.CustomProductImageService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductImageEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductImageEntity;
 import com.jomalls.custom.domain.service.CustomProductImageDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductInfoPropertyServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoPropertyServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductInfoPropertyVO;
-import com.jomalls.custom.app.service.CustomProductInfoPropertyService;
+import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductInfoPropertyEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity;
 import com.jomalls.custom.domain.service.CustomProductInfoPropertyDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductInfoServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductInfoServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.exception.ServiceException;
-import com.jomalls.custom.app.vo.CustomProductInfoPageVO;
 import com.jomalls.custom.app.vo.CustomProductInfoVO;
-import com.jomalls.custom.app.service.CustomProductInfoService;
+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.CustomProductInfoEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;
 import com.jomalls.custom.domain.service.CustomProductInfoDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,11 +45,11 @@ public class CustomProductInfoServiceImpl implements CustomProductInfoService {
     }
 
     @Override
-    public IPage<CustomProductInfoVO> pageList(CustomProductInfoPageVO customProductInfoPageVO) {
-        CustomAsserts.nonNull(customProductInfoPageVO, "分页查询参数不能为空");
+    public IPage<CustomProductInfoVO> pageList(CustomProductInfoDto param) {
+        CustomAsserts.nonNull(param, "分页查询参数不能为空");
         QueryWrapper<CustomProductInfoEntity> queryWrapper = new QueryWrapper<>();
         // TODO 根据业务条件组装入参
-        IPage<CustomProductInfoEntity> page = customProductInfoDomainService.selectPage(queryWrapper, customProductInfoPageVO);
+        IPage<CustomProductInfoEntity> page = customProductInfoDomainService.selectPage(queryWrapper, param);
         return page.convert(e -> BeanMapper.mapper().convert(e, CustomProductInfoVO.class));
     }
 

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductItemServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductItemServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductItemVO;
-import com.jomalls.custom.app.service.CustomProductItemService;
+import com.jomalls.custom.app.service.product.CustomProductItemService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductItemEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductItemEntity;
 import com.jomalls.custom.domain.service.CustomProductItemDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductRemarkServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductRemarkServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+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.CustomProductRemarkVO;
-import com.jomalls.custom.app.service.CustomProductRemarkService;
+import com.jomalls.custom.app.service.product.CustomProductRemarkService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity;
 import com.jomalls.custom.domain.service.CustomProductRemarkDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/CustomProductWarehouseRelServiceImpl.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductWarehouseRelServiceImpl.java

-package com.jomalls.custom.app.service.impl;
+package com.jomalls.custom.app.service.impl.product;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
 import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
-import com.jomalls.custom.app.service.CustomProductWarehouseRelService;
+import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
-import com.jomalls.custom.dal.entity.CustomProductWarehouseRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;
 import com.jomalls.custom.domain.service.CustomProductWarehouseRelDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductBlacklistService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductBlacklistService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductCnRemarkService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCnRemarkService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductCnRemarkPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductCraftRelService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductCraftRelService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductCraftRelPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductDiyUserRelService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductDiyUserRelService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductDiyUserRelPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductFactoryPriceIntervalRelService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceIntervalRelService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductFactoryPriceRelService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceRelService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductImageService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductImageService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductImagePageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductInfoPropertyService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoPropertyService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductInfoPropertyPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductInfoService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductInfoService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductInfoPageVO;
+import com.jomalls.custom.app.dto.product.CustomProductInfoDto;
 import com.jomalls.custom.app.vo.CustomProductInfoVO;
 
 import java.util.List;
@@ -25,10 +25,10 @@ public interface CustomProductInfoService {
     /**
      * 根据条件查询分页列表接口
      *
-     * @param customProductInfoPageVO 分页入参model
+     * @param param 分页入参model
      * @return 分页对象
      */
-    IPage<CustomProductInfoVO> pageList(CustomProductInfoPageVO customProductInfoPageVO);
+    IPage<CustomProductInfoVO> pageList(CustomProductInfoDto param);
 
     /**
      * 根据id查询详情

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductItemService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductItemService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductItemPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductRemarkService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductRemarkService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductRemarkPageVO;

custom-server-app/src/main/java/com/jomalls/custom/app/service/CustomProductWarehouseRelService.java → custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductWarehouseRelService.java

-package com.jomalls.custom.app.service;
+package com.jomalls.custom.app.service.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductBlacklistEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductBlacklistEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductCnRemarkEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductCnRemarkEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductCraftRelEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductCraftRelEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductDiyUserRelEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductDiyUserRelEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductFactoryPriceIntervalRelEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductFactoryPriceIntervalRelEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductFactoryPriceRelEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductFactoryPriceRelEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductImageEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductImageEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductInfoEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductInfoEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductInfoPropertyEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductInfoPropertyEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductItemEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductItemEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductRemarkEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductRemarkEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/CustomProductWarehouseRelEntity.java → custom-server-domain/src/main/java/com/jomalls/custom/dal/entity/product/CustomProductWarehouseRelEntity.java

-package com.jomalls.custom.dal.entity;
+package com.jomalls.custom.dal.entity.product;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductBlacklistMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductBlacklistEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductCnRemarkMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductCnRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductCraftRelMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductCraftRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductDiyUserRelMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductDiyUserRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductFactoryPriceIntervalRelMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceIntervalRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductFactoryPriceRelMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductImageMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductImageEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductImageEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductInfoMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductInfoEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductInfoPropertyMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductInfoPropertyEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductItemMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductItemEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductItemEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductRemarkMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/dal/mapper/CustomProductWarehouseRelMapper.java

 package com.jomalls.custom.dal.mapper;
 
-import com.jomalls.custom.dal.entity.CustomProductWarehouseRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;
 import com.jomalls.custom.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductBlacklistDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductBlacklistEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductCnRemarkDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductCnRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductCraftRelDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductCraftRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductDiyUserRelDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductDiyUserRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductFactoryPriceIntervalRelDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceIntervalRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductFactoryPriceRelDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductImageDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductImageEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductImageEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductInfoDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductInfoEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductInfoPropertyDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductInfoPropertyEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductItemDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductItemEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductItemEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductRemarkDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/CustomProductWarehouseRelDomainService.java

 package com.jomalls.custom.domain.service;
 
-import com.jomalls.custom.dal.entity.CustomProductWarehouseRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;
 import com.jomalls.custom.service.IBaseService;
 
 /**

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductBlacklistDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductBlacklistMapper;
-import com.jomalls.custom.dal.entity.CustomProductBlacklistEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity;
 import com.jomalls.custom.domain.service.CustomProductBlacklistDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductCnRemarkDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductCnRemarkMapper;
-import com.jomalls.custom.dal.entity.CustomProductCnRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity;
 import com.jomalls.custom.domain.service.CustomProductCnRemarkDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductCraftRelDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductCraftRelMapper;
-import com.jomalls.custom.dal.entity.CustomProductCraftRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity;
 import com.jomalls.custom.domain.service.CustomProductCraftRelDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductDiyUserRelDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductDiyUserRelMapper;
-import com.jomalls.custom.dal.entity.CustomProductDiyUserRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity;
 import com.jomalls.custom.domain.service.CustomProductDiyUserRelDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductFactoryPriceIntervalRelDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductFactoryPriceIntervalRelMapper;
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceIntervalRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;
 import com.jomalls.custom.domain.service.CustomProductFactoryPriceIntervalRelDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductFactoryPriceRelDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductFactoryPriceRelMapper;
-import com.jomalls.custom.dal.entity.CustomProductFactoryPriceRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity;
 import com.jomalls.custom.domain.service.CustomProductFactoryPriceRelDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductImageDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductImageMapper;
-import com.jomalls.custom.dal.entity.CustomProductImageEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductImageEntity;
 import com.jomalls.custom.domain.service.CustomProductImageDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductInfoDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductInfoMapper;
-import com.jomalls.custom.dal.entity.CustomProductInfoEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;
 import com.jomalls.custom.domain.service.CustomProductInfoDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductInfoPropertyDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductInfoPropertyMapper;
-import com.jomalls.custom.dal.entity.CustomProductInfoPropertyEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity;
 import com.jomalls.custom.domain.service.CustomProductInfoPropertyDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductItemDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductItemMapper;
-import com.jomalls.custom.dal.entity.CustomProductItemEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductItemEntity;
 import com.jomalls.custom.domain.service.CustomProductItemDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductRemarkDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductRemarkMapper;
-import com.jomalls.custom.dal.entity.CustomProductRemarkEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity;
 import com.jomalls.custom.domain.service.CustomProductRemarkDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/java/com/jomalls/custom/domain/service/impl/CustomProductWarehouseRelDomainServiceImpl.java

 package com.jomalls.custom.domain.service.impl;
 
 import com.jomalls.custom.dal.mapper.CustomProductWarehouseRelMapper;
-import com.jomalls.custom.dal.entity.CustomProductWarehouseRelEntity;
+import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;
 import com.jomalls.custom.domain.service.CustomProductWarehouseRelDomainService;
 import com.jomalls.custom.service.impl.BaseServiceImpl;
 import org.apache.ibatis.session.SqlSessionFactory;

custom-server-domain/src/main/resources/mapper/CustomProductBlacklistMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductBlacklistMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductBlacklistEntity" id="customProductBlacklistMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity" id="customProductBlacklistMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductCnRemarkMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductCnRemarkMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductCnRemarkEntity" id="customProductCnRemarkMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity" id="customProductCnRemarkMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductCraftRelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductCraftRelMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductCraftRelEntity" id="customProductCraftRelMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity" id="customProductCraftRelMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductDiyUserRelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductDiyUserRelMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductDiyUserRelEntity" id="customProductDiyUserRelMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity" id="customProductDiyUserRelMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductFactoryPriceIntervalRelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductFactoryPriceIntervalRelMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductFactoryPriceIntervalRelEntity" id="customProductFactoryPriceIntervalRelMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity" id="customProductFactoryPriceIntervalRelMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductFactoryPriceRelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductFactoryPriceRelMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductFactoryPriceRelEntity" id="customProductFactoryPriceRelMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity" id="customProductFactoryPriceRelMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductImageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductImageMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductImageEntity" id="customProductImageMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductImageEntity" id="customProductImageMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductInfoMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductInfoEntity" id="customProductInfoMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductInfoEntity" id="customProductInfoMap">
 
                     <result property="id" column="id"/>
                     <result property="sku" column="sku"/>

custom-server-domain/src/main/resources/mapper/CustomProductInfoPropertyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductInfoPropertyMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductInfoPropertyEntity" id="customProductInfoPropertyMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity" id="customProductInfoPropertyMap">
 
                     <result property="id" column="id"/>
                     <result property="infoId" column="info_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductItemMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductItemEntity" id="customProductItemMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductItemEntity" id="customProductItemMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductRemarkMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductRemarkMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductRemarkEntity" id="customProductRemarkMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity" id="customProductRemarkMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-domain/src/main/resources/mapper/CustomProductWarehouseRelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jomalls.custom.dal.mapper.CustomProductWarehouseRelMapper">
     <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.jomalls.custom.dal.entity.CustomProductWarehouseRelEntity" id="customProductWarehouseRelMap">
+    <resultMap type="com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity" id="customProductWarehouseRelMap">
 
                     <result property="id" column="id"/>
                     <result property="productId" column="product_id"/>

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductBlacklistController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductBlacklistController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductBlacklistVO;
-import com.jomalls.custom.app.service.CustomProductBlacklistService;
+import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductCnRemarkController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCnRemarkController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductCnRemarkVO;
-import com.jomalls.custom.app.service.CustomProductCnRemarkService;
+import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductCraftRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductCraftRelController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductCraftRelVO;
-import com.jomalls.custom.app.service.CustomProductCraftRelService;
+import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductDiyUserRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductDiyUserRelController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductDiyUserRelVO;
-import com.jomalls.custom.app.service.CustomProductDiyUserRelService;
+import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductFactoryPriceIntervalRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceIntervalRelController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductFactoryPriceIntervalRelVO;
-import com.jomalls.custom.app.service.CustomProductFactoryPriceIntervalRelService;
+import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductFactoryPriceRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductFactoryPriceRelController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductFactoryPriceRelVO;
-import com.jomalls.custom.app.service.CustomProductFactoryPriceRelService;
+import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductImageController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductImageController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductImageVO;
-import com.jomalls.custom.app.service.CustomProductImageService;
+import com.jomalls.custom.app.service.product.CustomProductImageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductInfoController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoController.java

-package com.jomalls.custom.webapp.controller;
+package com.jomalls.custom.webapp.controller.product;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.CustomProductInfoPageVO;
+import com.jomalls.custom.app.dto.product.CustomProductInfoDto;
 import com.jomalls.custom.app.vo.CustomProductInfoVO;
-import com.jomalls.custom.app.service.CustomProductInfoService;
+import com.jomalls.custom.app.service.product.CustomProductInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,7 +24,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "/customProductInfo", description = "Controller")
-@RequestMapping("/customProductInfo")
+@RequestMapping("/api/product/info")
 public class CustomProductInfoController {
 
     @Autowired
@@ -45,13 +45,13 @@ public class CustomProductInfoController {
     /**
      * 根据条件查询分页列表接口
      *
-     * @param customProductInfoPageVO 分页入参model
+     * @param  param 分页入参model
      * @return 分页对象
      */
     @Operation(summary = "分页列表接口", description = "根据条件查询分页列表接口")
     @RequestMapping(value = "/pageList", method = RequestMethod.POST)
-    public IPage<CustomProductInfoVO> pageList(@RequestBody CustomProductInfoPageVO customProductInfoPageVO) {
-        return customProductInfoService.pageList(customProductInfoPageVO);
+    public IPage<CustomProductInfoVO> pageList(@RequestBody CustomProductInfoDto param) {
+        return customProductInfoService.pageList(param);
     }
 
 

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductInfoPropertyController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductInfoPropertyController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductInfoPropertyVO;
-import com.jomalls.custom.app.service.CustomProductInfoPropertyService;
+import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductItemController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductItemController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductItemVO;
-import com.jomalls.custom.app.service.CustomProductItemService;
+import com.jomalls.custom.app.service.product.CustomProductItemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductRemarkController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductRemarkController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductRemarkVO;
-import com.jomalls.custom.app.service.CustomProductRemarkService;
+import com.jomalls.custom.app.service.product.CustomProductRemarkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductWarehouseRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/product/CustomProductWarehouseRelController.java

-package com.jomalls.custom.webapp.controller;
+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.CustomProductWarehouseRelVO;
-import com.jomalls.custom.app.service.CustomProductWarehouseRelService;
+import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;