diff --git a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/controller/XzDryMatterCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/controller/XzDryMatterCorrectionController.java similarity index 93% rename from zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/controller/XzDryMatterCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/controller/XzDryMatterCorrectionController.java index 8efc78e..d250d5c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/controller/XzDryMatterCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/controller/XzDryMatterCorrectionController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dryMatterCorrection.controller; +package com.zhyc.module.dairyProducts.dryMatterCorrection.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection; -import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService; +import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/domain/XzDryMatterCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/domain/XzDryMatterCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java index 2bbb0d2..5ea4e82 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/domain/XzDryMatterCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/domain/XzDryMatterCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.dryMatterCorrection.domain; +package com.zhyc.module.dairyProducts.dryMatterCorrection.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java index 123db3c..8566be9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/mapper/XzDryMatterCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dryMatterCorrection.mapper; +package com.zhyc.module.dairyProducts.dryMatterCorrection.mapper; import java.util.List; -import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; /** * 干物质校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/IXzDryMatterCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/IXzDryMatterCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java index 06359a9..ce3a891 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/IXzDryMatterCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/IXzDryMatterCorrectionService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.dryMatterCorrection.service; +package com.zhyc.module.dairyProducts.dryMatterCorrection.service; import java.util.List; -import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; /** * 干物质校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java index 948a2b6..dcf666f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/dryMatterCorrection/service/impl/XzDryMatterCorrectionServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhyc.module.dryMatterCorrection.service.impl; +package com.zhyc.module.dairyProducts.dryMatterCorrection.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper; -import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection; -import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService; +import com.zhyc.module.dairyProducts.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper; +import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; +import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; /** * 干物质校正Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/controller/XzParityCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/controller/XzParityCorrectionController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/parityCorrection/controller/XzParityCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/controller/XzParityCorrectionController.java index fbecfc9..edc1fba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/controller/XzParityCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/controller/XzParityCorrectionController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.parityCorrection.controller; +package com.zhyc.module.dairyProducts.parityCorrection.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.parityCorrection.domain.XzParityCorrection; -import com.zhyc.module.parityCorrection.service.IXzParityCorrectionService; +import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; diff --git a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/domain/XzParityCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java similarity index 95% rename from zhyc-module/src/main/java/com/zhyc/module/parityCorrection/domain/XzParityCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java index 107b070..3c9e098 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/domain/XzParityCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/domain/XzParityCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.parityCorrection.domain; +package com.zhyc.module.dairyProducts.parityCorrection.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/mapper/XzParityCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/parityCorrection/mapper/XzParityCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java index ff6a1b4..392ff04 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/mapper/XzParityCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/mapper/XzParityCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.parityCorrection.mapper; +package com.zhyc.module.dairyProducts.parityCorrection.mapper; import java.util.List; -import com.zhyc.module.parityCorrection.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; /** * 胎次校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/IXzParityCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/IXzParityCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java index 7845899..099dfa2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/IXzParityCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/IXzParityCorrectionService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.parityCorrection.service; +package com.zhyc.module.dairyProducts.parityCorrection.service; import java.util.List; -import com.zhyc.module.parityCorrection.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; /** * 胎次校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java index 7f97f3f..ef55515 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/parityCorrection/service/impl/XzParityCorrectionServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhyc.module.parityCorrection.service.impl; +package com.zhyc.module.dairyProducts.parityCorrection.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.parityCorrection.mapper.XzParityCorrectionMapper; -import com.zhyc.module.parityCorrection.domain.XzParityCorrection; -import com.zhyc.module.parityCorrection.service.IXzParityCorrectionService; +import com.zhyc.module.dairyProducts.parityCorrection.mapper.XzParityCorrectionMapper; +import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; +import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; /** * 胎次校正Service业务层处理 diff --git a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/controller/XzWegihCorrectionController.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java similarity index 94% rename from zhyc-module/src/main/java/com/zhyc/module/weightCorrection/controller/XzWegihCorrectionController.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java index ea692ab..36baa44 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/controller/XzWegihCorrectionController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/controller/XzWegihCorrectionController.java @@ -1,4 +1,4 @@ -package com.zhyc.module.weightCorrection.controller; +package com.zhyc.module.dairyProducts.weightCorrection.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; -import com.zhyc.module.weightCorrection.domain.XzWegihCorrection; -import com.zhyc.module.weightCorrection.service.IXzWegihCorrectionService; +import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; diff --git a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/domain/XzWegihCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java similarity index 97% rename from zhyc-module/src/main/java/com/zhyc/module/weightCorrection/domain/XzWegihCorrection.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java index f3c3d6b..5a53ac8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/domain/XzWegihCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/domain/XzWegihCorrection.java @@ -1,4 +1,4 @@ -package com.zhyc.module.weightCorrection.domain; +package com.zhyc.module.dairyProducts.weightCorrection.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/mapper/XzWegihCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/weightCorrection/mapper/XzWegihCorrectionMapper.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java index 1b92971..2d1a65b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/mapper/XzWegihCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/mapper/XzWegihCorrectionMapper.java @@ -1,7 +1,7 @@ -package com.zhyc.module.weightCorrection.mapper; +package com.zhyc.module.dairyProducts.weightCorrection.mapper; import java.util.List; -import com.zhyc.module.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; /** * 称重校正Mapper接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/IXzWegihCorrectionService.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java similarity index 90% rename from zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/IXzWegihCorrectionService.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java index 57c2144..04f070a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/IXzWegihCorrectionService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/IXzWegihCorrectionService.java @@ -1,7 +1,7 @@ -package com.zhyc.module.weightCorrection.service; +package com.zhyc.module.dairyProducts.weightCorrection.service; import java.util.List; -import com.zhyc.module.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; /** * 称重校正Service接口 diff --git a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java similarity index 87% rename from zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java index b69187a..a8c59fb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/weightCorrection/service/impl/XzWegihCorrectionServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhyc.module.weightCorrection.service.impl; +package com.zhyc.module.dairyProducts.weightCorrection.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.zhyc.module.weightCorrection.mapper.XzWegihCorrectionMapper; -import com.zhyc.module.weightCorrection.domain.XzWegihCorrection; -import com.zhyc.module.weightCorrection.service.IXzWegihCorrectionService; +import com.zhyc.module.dairyProducts.weightCorrection.mapper.XzWegihCorrectionMapper; +import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; +import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; /** * 称重校正Service业务层处理 diff --git a/zhyc-module/src/main/resources/mapper/dryMatterCorrection/XzDryMatterCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml similarity index 96% rename from zhyc-module/src/main/resources/mapper/dryMatterCorrection/XzDryMatterCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml index 0e4e33c..4099d6e 100644 --- a/zhyc-module/src/main/resources/mapper/dryMatterCorrection/XzDryMatterCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/dryMatterCorrection/XzDryMatterCorrectionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/parityCorrection/XzParityCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml similarity index 95% rename from zhyc-module/src/main/resources/mapper/parityCorrection/XzParityCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml index 217cd7d..3e76551 100644 --- a/zhyc-module/src/main/resources/mapper/parityCorrection/XzParityCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/parityCorrection/XzParityCorrectionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/zhyc-module/src/main/resources/mapper/weightCorrection/XzWegihCorrectionMapper.xml b/zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml similarity index 97% rename from zhyc-module/src/main/resources/mapper/weightCorrection/XzWegihCorrectionMapper.xml rename to zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml index 6c19408..38696ad 100644 --- a/zhyc-module/src/main/resources/mapper/weightCorrection/XzWegihCorrectionMapper.xml +++ b/zhyc-module/src/main/resources/mapper/dairyProducts/weightCorrection/XzWegihCorrectionMapper.xml @@ -2,7 +2,7 @@ - +