diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayCompanyManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java similarity index 91% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayCompanyManagementCommon.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java index 9241e800..7b07b564 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayCompanyManagementCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java @@ -1,4 +1,4 @@ -package com.jero.modules.company.common; +package com.jero.company.common; public class PayCompanyManagementCommon { /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayContactsManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java similarity index 91% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayContactsManagementCommon.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java index 06db94d3..2e6a045e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/common/PayContactsManagementCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java @@ -1,4 +1,4 @@ -package com.jero.modules.company.common; +package com.jero.company.common; public class PayContactsManagementCommon { /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java similarity index 98% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayCompanyManagementController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 2b0de549..a29b06c8 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -1,4 +1,4 @@ -package com.jero.modules.company.controller; +package com.jero.company.controller; import java.util.*; import java.util.stream.Collectors; @@ -13,9 +13,9 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; -import com.jero.modules.company.common.PayCompanyManagementCommon; -import com.jero.modules.company.entity.PayCompanyManagement; -import com.jero.modules.company.service.IPayCompanyManagementService; +import com.jero.company.common.PayCompanyManagementCommon; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.service.IPayCompanyManagementService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java similarity index 97% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayContactsManagementController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 543ab498..4b9ac75f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -1,4 +1,4 @@ -package com.jero.modules.company.controller; +package com.jero.company.controller; import java.util.*; import java.util.regex.Matcher; @@ -16,10 +16,10 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; -import com.jero.modules.company.common.PayCompanyManagementCommon; -import com.jero.modules.company.common.PayContactsManagementCommon; -import com.jero.modules.company.entity.PayContactsManagement; -import com.jero.modules.company.service.IPayContactsManagementService; +import com.jero.company.common.PayCompanyManagementCommon; +import com.jero.company.common.PayContactsManagementCommon; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java similarity index 97% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayCompanyManagement.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index 505a315e..1fe616cd 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -1,11 +1,10 @@ -package com.jero.modules.company.entity; +package com.jero.company.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.system.volid.group.Group; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java similarity index 97% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayContactsManagement.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 449970e9..e4ae0ae6 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -1,11 +1,10 @@ -package com.jero.modules.company.entity; +package com.jero.company.entity; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.system.volid.group.GroupA; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java similarity index 71% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayCompanyManagementMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java index 7dcb58a0..8a02533b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayCompanyManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java @@ -1,8 +1,8 @@ -package com.jero.modules.company.mapper; +package com.jero.company.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayCompanyManagement; /** * @Description: pay_company_management diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayContactsManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java similarity index 71% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayContactsManagementMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java index f674ac49..1b5a21c2 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/PayContactsManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java @@ -1,8 +1,8 @@ -package com.jero.modules.company.mapper; +package com.jero.company.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.company.entity.PayContactsManagement; +import com.jero.company.entity.PayContactsManagement; /** * @Description: pay_contacts_management diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml similarity index 64% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayCompanyManagementMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index 03592a9d..9c898582 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml similarity index 64% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayContactsManagementMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index a87315e0..ea43f6dc 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java similarity index 85% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayCompanyManagementService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index eef089f8..c1dea8bd 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -1,8 +1,8 @@ -package com.jero.modules.company.service; +package com.jero.company.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayCompanyManagement; import java.util.List; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayContactsManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java similarity index 78% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayContactsManagementService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java index f1eb0a69..a5f00c24 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/IPayContactsManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java @@ -1,9 +1,9 @@ -package com.jero.modules.company.service; +package com.jero.company.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.company.entity.PayCompanyManagement; -import com.jero.modules.company.entity.PayContactsManagement; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; import java.util.List; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java similarity index 82% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayCompanyManagementServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index c2dc344d..e19e2dcb 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -1,9 +1,9 @@ -package com.jero.modules.company.service.impl; +package com.jero.company.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.company.entity.PayCompanyManagement; -import com.jero.modules.company.mapper.PayCompanyManagementMapper; -import com.jero.modules.company.service.IPayCompanyManagementService; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.mapper.PayCompanyManagementMapper; +import com.jero.company.service.IPayCompanyManagementService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java similarity index 82% rename from jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayContactsManagementServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 51d3423a..4cdbcea7 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -1,10 +1,10 @@ -package com.jero.modules.company.service.impl; +package com.jero.company.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.company.entity.PayContactsManagement; -import com.jero.modules.company.mapper.PayContactsManagementMapper; -import com.jero.modules.company.service.IPayContactsManagementService; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.mapper.PayContactsManagementMapper; +import com.jero.company.service.IPayContactsManagementService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;