# Conflicts:
#	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/product/CustomProductWarehouseRelService.java