调整目录结构

custom-server-app/src/main/java/com/jomalls/custom/app/aspect/PermissionAspect.java

@@ -2,7 +2,7 @@ package com.jomalls.custom.app.aspect;
 
 import com.jomalls.custom.app.annotation.RequiresPermissions;
 import com.jomalls.custom.app.annotation.RequiresRoles;
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.service.PermissionService;
 import lombok.extern.slf4j.Slf4j;

custom-server-app/src/main/java/com/jomalls/custom/app/aspect/RepeatSubmitAspect.java

@@ -2,7 +2,7 @@ package com.jomalls.custom.app.aspect;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jomalls.custom.app.annotation.RepeatSubmit;
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.utils.RequestHolder;
 import com.jomalls.custom.security.SecurityUtils;

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

-package com.jomalls.custom.app.dto.product;
+package com.jomalls.custom.app.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

-package com.jomalls.custom.app.dto.product;
+package com.jomalls.custom.app.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jomalls.custom.page.PageRequest;

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

-package com.jomalls.custom.app.dto.product;
+package com.jomalls.custom.app.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

-package com.jomalls.custom.app.dto.product;
+package com.jomalls.custom.app.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

-package com.jomalls.custom.app.dto.product;
+package com.jomalls.custom.app.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

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

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

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

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

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

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

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

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

-package com.jomalls.custom.app.service.product;
+package com.jomalls.custom.app.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
 import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;
 
 import java.util.List;

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

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

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

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

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

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

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

-package com.jomalls.custom.app.service.product;
+package com.jomalls.custom.app.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.dto.product.CustomProductInfoDTO;
-import com.jomalls.custom.app.vo.product.CustomProductInfoVO;
+import com.jomalls.custom.app.dto.CustomProductInfoDTO;
+import com.jomalls.custom.app.vo.CustomProductInfoVO;
 
 import java.util.List;
 

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

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

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

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

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

-package com.jomalls.custom.app.service.product;
+package com.jomalls.custom.app.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
+import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
 import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;
 
 import java.util.List;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
-import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductBlacklistEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductCnRemarkPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductCnRemarkVO;
-import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductCnRemarkEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductCraftRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductCraftRelVO;
-import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductCraftRelEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductDiyUserRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelVO;
-import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductDiyUserRelEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
-import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceIntervalRelEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductFactoryPriceRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelVO;
-import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductFactoryPriceRelEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductImagePageVO;
-import com.jomalls.custom.app.vo.product.CustomProductImageVO;
-import com.jomalls.custom.app.service.product.CustomProductImageService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductImageEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductInfoPropertyPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyVO;
-import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductInfoPropertyEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.CustomProductInfoDTO;
 import com.jomalls.custom.app.exception.ServiceException;
-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.integrate.service.BaseCategoryInfoService;
+import com.jomalls.custom.integrate.model.BaseCategoryInfoVO;
+import com.jomalls.custom.app.vo.CustomProductInfoVO;
+import com.jomalls.custom.app.service.CustomProductInfoService;
 import com.jomalls.custom.app.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductInfoEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductItemPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductItemVO;
-import com.jomalls.custom.app.service.product.CustomProductItemService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductItemEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 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.product.CustomProductRemarkPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductRemarkVO;
-import com.jomalls.custom.app.service.product.CustomProductRemarkService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductRemarkEntity;

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

-package com.jomalls.custom.app.service.impl.product;
+package com.jomalls.custom.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
-import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
+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.utils.BeanMapper;
 import com.jomalls.custom.app.utils.CustomAsserts;
 import com.jomalls.custom.dal.entity.product.CustomProductWarehouseRelEntity;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductBlacklistPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductBlacklistVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductBlacklistVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductCnRemarkPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductCnRemarkVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCnRemarkVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductCraftRelPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductCraftRelVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductCraftRelVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductDiyUserRelPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductDiyUserRelVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductDiyUserRelVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductFactoryPriceIntervalRelPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductFactoryPriceIntervalRelVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceIntervalRelVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductFactoryPriceRelPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductFactoryPriceRelVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductFactoryPriceRelVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductImagePageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImagePageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductImageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductImageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductInfoPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductInfoPropertyPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductInfoPropertyVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoPropertyVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductInfoVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductInfoVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductItemPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductItemVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductItemVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductRemarkPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductRemarkVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductRemarkVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductWarehouseRelPageVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelPageVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import com.jomalls.custom.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/CustomProductWarehouseRelVO.java → custom-server-app/src/main/java/com/jomalls/custom/app/vo/CustomProductWarehouseRelVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.app.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

custom-server-app/src/main/java/com/jomalls/custom/app/enums/CodeEnum.java → custom-server-core/src/main/java/com/jomalls/custom/enums/CodeEnum.java

-package com.jomalls.custom.app.enums;
+package com.jomalls.custom.enums;
 
 
 import lombok.Getter;

custom-server-app/src/main/java/com/jomalls/custom/app/utils/R.java → custom-server-core/src/main/java/com/jomalls/custom/utils/R.java

-package com.jomalls.custom.app.utils;
+package com.jomalls.custom.utils;
 
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

custom-server-integrate/pom.xml

@@ -26,6 +26,11 @@
             <version>3.2.2</version>
         </dependency>
         <dependency>
+            <groupId>com.jomalls.custom</groupId>
+            <artifactId>custom-server-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>

custom-server-app/src/main/java/com/jomalls/custom/app/vo/product/BaseCategoryInfoVO.java → custom-server-integrate/src/main/java/com/jomalls/custom/integrate/model/BaseCategoryInfoVO.java

-package com.jomalls.custom.app.vo.product;
+package com.jomalls.custom.integrate.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

-package com.jomalls.custom.app.service.impl.common;
+package com.jomalls.custom.integrate.service;
 
-import com.jomalls.custom.app.vo.product.BaseCategoryInfoVO;
+import com.jomalls.custom.integrate.model.BaseCategoryInfoVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

custom-server-starter/src/main/java/com/jomalls/custom/config/CommonExceptionHandlerAdvice.java

 package com.jomalls.custom.config;
 
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import com.jomalls.custom.app.exception.InvalidTokenException;
 import com.jomalls.custom.app.exception.PermissionDeniedException;
 import com.jomalls.custom.integrate.exception.RemoteServiceException;
 import com.jomalls.custom.app.exception.ServiceException;
-import com.jomalls.custom.app.utils.R;
+import com.jomalls.custom.utils.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

custom-server-starter/src/main/java/com/jomalls/custom/config/RestResponseBodyConfig.java

 package com.jomalls.custom.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import org.jspecify.annotations.NonNull;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -56,18 +56,18 @@ public class RestResponseBodyConfig implements ResponseBodyAdvice<Object> {
             String requestPath = request.getURI().getPath();
             ServletServerHttpResponse httpResponse = (ServletServerHttpResponse) response;
             if (httpResponse.getServletResponse().getStatus() == HttpStatus.NOT_FOUND.value()) {
-                return com.jomalls.custom.app.utils.R.fail(CodeEnum.NOT_FOUND);
+                return com.jomalls.custom.utils.R.fail(CodeEnum.NOT_FOUND);
             } else if (this.isNoWrapResponseUrl(requestPath)) {
                 return body;
             } else {
                 if (body instanceof String) {
                     try {
-                        return objectMapper.writeValueAsString(com.jomalls.custom.app.utils.R.ok(body));
+                        return objectMapper.writeValueAsString(com.jomalls.custom.utils.R.ok(body));
                     } catch (Exception e) {
                         return body;
                     }
                 }
-                return body instanceof com.jomalls.custom.app.utils.R ? body : com.jomalls.custom.app.utils.R.ok(body);
+                return body instanceof com.jomalls.custom.utils.R ? body : com.jomalls.custom.utils.R.ok(body);
             }
         }
     }

custom-server-starter/src/main/java/com/jomalls/custom/config/SecurityInterceptor.java

@@ -2,7 +2,7 @@
 package com.jomalls.custom.config;
 
 
-import com.jomalls.custom.app.enums.CodeEnum;
+import com.jomalls.custom.enums.CodeEnum;
 import com.jomalls.custom.app.exception.InvalidTokenException;
 import com.jomalls.custom.app.utils.RequestHolder;
 import com.jomalls.custom.security.LoginUser;
@@ -10,8 +10,6 @@ import com.jomalls.custom.security.SecurityUtils;
 import com.jomalls.custom.security.TokenHandle;
 import lombok.extern.slf4j.Slf4j;
 import org.jspecify.annotations.NonNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

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

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
-import com.jomalls.custom.app.service.product.CustomProductBlacklistService;
+import com.jomalls.custom.app.vo.CustomProductBlacklistPageVO;
+import com.jomalls.custom.app.vo.CustomProductBlacklistVO;
+import com.jomalls.custom.app.service.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/product/CustomProductCnRemarkController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductCnRemarkController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductCnRemarkPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductCnRemarkVO;
-import com.jomalls.custom.app.service.product.CustomProductCnRemarkService;
+import com.jomalls.custom.app.vo.CustomProductCnRemarkPageVO;
+import com.jomalls.custom.app.vo.CustomProductCnRemarkVO;
+import com.jomalls.custom.app.service.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/product/CustomProductCraftRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductCraftRelController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jomalls.custom.app.annotation.RequiresPermissions;
-import com.jomalls.custom.app.vo.product.CustomProductCraftRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductCraftRelVO;
-import com.jomalls.custom.app.service.product.CustomProductCraftRelService;
+import com.jomalls.custom.app.vo.CustomProductCraftRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductCraftRelVO;
+import com.jomalls.custom.app.service.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/product/CustomProductDiyUserRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductDiyUserRelController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductDiyUserRelVO;
-import com.jomalls.custom.app.service.product.CustomProductDiyUserRelService;
+import com.jomalls.custom.app.vo.CustomProductDiyUserRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductDiyUserRelVO;
+import com.jomalls.custom.app.service.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/product/CustomProductFactoryPriceIntervalRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductFactoryPriceIntervalRelController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
-import com.jomalls.custom.app.service.product.CustomProductFactoryPriceIntervalRelService;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceIntervalRelVO;
+import com.jomalls.custom.app.service.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/product/CustomProductFactoryPriceRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductFactoryPriceRelController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceRelVO;
-import com.jomalls.custom.app.service.product.CustomProductFactoryPriceRelService;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductFactoryPriceRelVO;
+import com.jomalls.custom.app.service.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/product/CustomProductImageController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductImageController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductImagePageVO;
-import com.jomalls.custom.app.vo.product.CustomProductImageVO;
-import com.jomalls.custom.app.service.product.CustomProductImageService;
+import com.jomalls.custom.app.vo.CustomProductImagePageVO;
+import com.jomalls.custom.app.vo.CustomProductImageVO;
+import com.jomalls.custom.app.service.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/product/CustomProductInfoController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductInfoController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.dto.product.CustomProductInfoDTO;
-import com.jomalls.custom.app.vo.product.CustomProductInfoVO;
-import com.jomalls.custom.app.service.product.CustomProductInfoService;
+import com.jomalls.custom.app.dto.CustomProductInfoDTO;
+import com.jomalls.custom.app.vo.CustomProductInfoVO;
+import com.jomalls.custom.app.service.CustomProductInfoService;
 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/product/CustomProductInfoPropertyController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductInfoPropertyController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductInfoPropertyVO;
-import com.jomalls.custom.app.service.product.CustomProductInfoPropertyService;
+import com.jomalls.custom.app.vo.CustomProductInfoPropertyPageVO;
+import com.jomalls.custom.app.vo.CustomProductInfoPropertyVO;
+import com.jomalls.custom.app.service.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/product/CustomProductItemController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductItemController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductItemPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductItemVO;
-import com.jomalls.custom.app.service.product.CustomProductItemService;
+import com.jomalls.custom.app.vo.CustomProductItemPageVO;
+import com.jomalls.custom.app.vo.CustomProductItemVO;
+import com.jomalls.custom.app.service.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/product/CustomProductRemarkController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductRemarkController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductRemarkPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductRemarkVO;
-import com.jomalls.custom.app.service.product.CustomProductRemarkService;
+import com.jomalls.custom.app.vo.CustomProductRemarkPageVO;
+import com.jomalls.custom.app.vo.CustomProductRemarkVO;
+import com.jomalls.custom.app.service.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/product/CustomProductWarehouseRelController.java → custom-server-webapp/src/main/java/com/jomalls/custom/webapp/controller/CustomProductWarehouseRelController.java

-package com.jomalls.custom.webapp.controller.product;
+package com.jomalls.custom.webapp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
-import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
-import com.jomalls.custom.app.service.product.CustomProductWarehouseRelService;
+import com.jomalls.custom.app.vo.CustomProductWarehouseRelPageVO;
+import com.jomalls.custom.app.vo.CustomProductWarehouseRelVO;
+import com.jomalls.custom.app.service.CustomProductWarehouseRelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;