diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
index a349edd4..ca722657 100644
--- a/eladmin-common/pom.xml
+++ b/eladmin-common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
eladmin
- me.zhengjie
+ cn.ysk.cashier2.64.0.0
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/AnonymousAccess.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/AnonymousAccess.java
index b2c168fe..d9143854 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/AnonymousAccess.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
import java.lang.annotation.*;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/DataPermission.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/DataPermission.java
index 044d551e..8a2d4373 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/DataPermission.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/Limit.java
similarity index 94%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/Limit.java
index 58b41cf8..862db134 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/Limit.java
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
+
+import cn.ysk.cashier.aspect.LimitType;
-import me.zhengjie.aspect.LimitType;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/Query.java
similarity index 98%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/Query.java
index e1758c9b..0decf204 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/Query.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousDeleteMapping.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousDeleteMapping.java
index 6a81c2e9..7d219cb3 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousDeleteMapping.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.annotation.rest;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import me.zhengjie.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousGetMapping.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousGetMapping.java
index c260a71b..76850ce2 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousGetMapping.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.annotation.rest;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import me.zhengjie.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPatchMapping.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPatchMapping.java
index 66866178..36ea1dcd 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPatchMapping.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.annotation.rest;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import me.zhengjie.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPostMapping.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPostMapping.java
index 8f1cdcdd..75ba422f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPostMapping.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.annotation.rest;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import me.zhengjie.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPutMapping.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPutMapping.java
index 7c417dac..b66cf6fa 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousPutMapping.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.annotation.rest;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import me.zhengjie.annotation.AnonymousAccess;
+import cn.ysk.cashier.annotation.AnonymousAccess;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java b/eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitAspect.java
similarity index 92%
rename from eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitAspect.java
index 31f40404..298d2806 100644
--- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitAspect.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.aspect;
+package cn.ysk.cashier.aspect;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.utils.StringUtils;
import com.google.common.collect.ImmutableList;
-import me.zhengjie.annotation.Limit;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.utils.RequestHolder;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.annotation.Limit;
+import cn.ysk.cashier.utils.RequestHolder;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -48,7 +48,7 @@ public class LimitAspect {
this.redisTemplate = redisTemplate;
}
- @Pointcut("@annotation(me.zhengjie.annotation.Limit)")
+ @Pointcut("@annotation(cn.ysk.cashier.annotation.Limit)")
public void pointcut() {
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java b/eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitType.java
similarity index 95%
rename from eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitType.java
index bf3f09e2..64b0665a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/aspect/LimitType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.aspect;
+package cn.ysk.cashier.aspect;
/**
* 限流枚举
diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseDTO.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/base/BaseDTO.java
index e9e7cc23..d30d8cdc 100644
--- a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseDTO.java
@@ -1,4 +1,4 @@
-package me.zhengjie.base;
+package cn.ysk.cashier.base;
import lombok.Getter;
import lombok.Setter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseEntity.java
similarity index 98%
rename from eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/base/BaseEntity.java
index 618e100c..99a53263 100644
--- a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseEntity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.base;
+package cn.ysk.cashier.base;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseMapper.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/base/BaseMapper.java
index e8bb825d..6ebd69f1 100644
--- a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/base/BaseMapper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.base;
+package cn.ysk.cashier.base;
import java.util.List;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/AuditorConfig.java
similarity index 94%
rename from eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/AuditorConfig.java
index 006ef6b9..392a6c6e 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/AuditorConfig.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
-import me.zhengjie.utils.SecurityUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
import org.springframework.data.domain.AuditorAware;
import org.springframework.stereotype.Component;
import java.util.Optional;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/ElAdminProperties.java
similarity index 93%
rename from eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/ElAdminProperties.java
index 28541858..f7122984 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/ElAdminProperties.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import lombok.Data;
-import me.zhengjie.utils.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/ElPermissionConfig.java
similarity index 94%
rename from eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/ElPermissionConfig.java
index 9ae1fd5d..8ff884fb 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/ElPermissionConfig.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
-import me.zhengjie.utils.SecurityUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.stereotype.Service;
import java.util.Arrays;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/FileProperties.java
similarity index 95%
rename from eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/FileProperties.java
index bf0ebf6a..e94b69eb 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/FileProperties.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import lombok.Data;
-import me.zhengjie.utils.ElAdminConstant;
+import cn.ysk.cashier.utils.ElAdminConstant;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
similarity index 90%
rename from eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
index 95217a26..308b76be 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSON;
@@ -81,17 +81,17 @@ public class RedisConfig extends CachingConfigurerSupport {
template.setValueSerializer(fastJsonRedisSerializer);
template.setHashValueSerializer(fastJsonRedisSerializer);
// fastjson 升级到 1.2.83 后需要指定序列化白名单
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.domain");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.service.dto");
+ ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.pojo");
+ ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.service");
// 模块内的实体类
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.mnt.domain");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.quartz.domain");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.domain");
+// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.mnt.domain");
+// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz.domain");
+// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system.domain");
// 模块内的 Dto
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.mnt.service.dto");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.quartz.service.dto");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.security.service.dto");
- ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.service.dto");
+ ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.mnt");
+ ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz");
+ ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.config");
+// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system.service.dto");
// key的序列化采用StringRedisSerializer
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/RsaProperties.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/RsaProperties.java
index 0a4a5375..439cb52b 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/RsaProperties.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java b/eladmin-common/src/main/java/cn/ysk/cashier/config/SwaggerConfig.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/config/SwaggerConfig.java
index 989be98d..5a88cba8 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/SwaggerConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import cn.hutool.core.collection.CollUtil;
import com.fasterxml.classmate.TypeResolver;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/BadConfigurationException.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/BadConfigurationException.java
index ede3691f..20b545bd 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/BadConfigurationException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
/**
* 统一关于错误配置信息 异常
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/BadRequestException.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/BadRequestException.java
index 900453bd..c953495f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/BadRequestException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
import lombok.Getter;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityExistException.java
similarity index 96%
rename from eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityExistException.java
index 03f9bf2a..77e50fad 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityExistException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
import org.springframework.util.StringUtils;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityNotFoundException.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityNotFoundException.java
index bcdc9562..1c57237a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/EntityNotFoundException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
import org.springframework.util.StringUtils;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/NewBadRequestException.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/NewBadRequestException.java
similarity index 93%
rename from eladmin-common/src/main/java/me/zhengjie/exception/NewBadRequestException.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/NewBadRequestException.java
index 85f822df..7a55a824 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/NewBadRequestException.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/NewBadRequestException.java
@@ -1,4 +1,4 @@
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
import lombok.Getter;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/ApiError.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/ApiError.java
index 5112730b..83e95806 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/ApiError.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception.handler;
+package cn.ysk.cashier.exception.handler;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java b/eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/GlobalExceptionHandler.java
similarity index 94%
rename from eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/GlobalExceptionHandler.java
index 23cbb383..613e0f8e 100644
--- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/exception/handler/GlobalExceptionHandler.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.exception.handler;
+package cn.ysk.cashier.exception.handler;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.exception.EntityExistException;
-import me.zhengjie.exception.EntityNotFoundException;
-import me.zhengjie.utils.ThrowableUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.exception.EntityExistException;
+import cn.ysk.cashier.exception.EntityNotFoundException;
+import cn.ysk.cashier.utils.ThrowableUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CacheKey.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/CacheKey.java
index 7485713f..1134afd1 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CacheKey.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
/**
* @author: liaojinlong
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CallBack.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/CallBack.java
index 9b108127..a05520b6 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CallBack.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
/**
* @author: liaojinlong
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CloseUtil.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/CloseUtil.java
index f39919f2..3673d04b 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/CloseUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import java.io.Closeable;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/DateUtil.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/DateUtil.java
index 0b0bf637..f3b1fbcc 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/DateUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import java.time.*;
import java.time.format.DateTimeFormatter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ElAdminConstant.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/ElAdminConstant.java
index 08f9c3c1..fcecec40 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ElAdminConstant.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
/**
* 常用静态常量
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/EncryptUtils.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/EncryptUtils.java
index 4f334aac..93c3b493 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/EncryptUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/FileUtil.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/FileUtil.java
index 0d8d5fb4..0f2fcacc 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/FileUtil.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
-import me.zhengjie.exception.BadRequestException;
+import cn.ysk.cashier.exception.BadRequestException;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.slf4j.Logger;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ListUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ListUtil.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/ListUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/ListUtil.java
index eab18ad0..c66fd420 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ListUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ListUtil.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/MD5Utils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/MD5Utils.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/MD5Utils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/MD5Utils.java
index 6f8cb611..56c4bdab 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/MD5Utils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/MD5Utils.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.util.ObjectUtil;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/PageUtil.java
similarity index 98%
rename from eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/PageUtil.java
index 1382584a..a3a22399 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/PageUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.springframework.data.domain.Page;
import java.util.*;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/PhoneUtil.java
similarity index 94%
rename from eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/PhoneUtil.java
index 5f79199a..eef0e174 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/PhoneUtil.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java
similarity index 98%
rename from eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java
index 69cb5e24..7cc3d442 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.DataPermission;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.DataPermission;
+import cn.ysk.cashier.annotation.Query;
import javax.persistence.criteria.*;
import java.lang.reflect.Field;
import java.util.*;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java
index b49b3ca5..b60007cb 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RequestHolder.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/RequestHolder.java
index 71a4b9e5..1ef30138 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RequestHolder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/Result.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/Result.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/Result.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/Result.java
index 6b163385..c31a6539 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/Result.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/Result.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RsaUtils.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/RsaUtils.java
index 8123ff38..4f9f9a41 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RsaUtils.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.apache.commons.codec.binary.Base64;
import javax.crypto.Cipher;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
similarity index 95%
rename from eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
index 08f4c042..a7ee2a79 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.utils.enums.DataScopeEnum;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.utils.enums.DataScopeEnum;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SpringContextHolder.java
similarity index 99%
rename from eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/SpringContextHolder.java
index 41ead386..34d58f3a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SpringContextHolder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/StringUtils.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/StringUtils.java
index 3da39009..3926754c 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/StringUtils.java
@@ -13,16 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.config.ElAdminProperties;
+import cn.ysk.cashier.config.ElAdminProperties;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
import nl.basjes.parse.useragent.UserAgent;
@@ -33,11 +31,6 @@ import java.net.NetworkInterface;
import java.net.UnknownHostException;
import java.util.*;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-
-import java.util.List;
-
/**
* @author Zheng Jie
* 字符串工具类, 继承org.apache.commons.lang3.StringUtils类
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/Threads.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/Threads.java
similarity index 89%
rename from eladmin-common/src/main/java/me/zhengjie/utils/Threads.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/Threads.java
index aab0b03c..b2391992 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/Threads.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/Threads.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import java.util.concurrent.CompletableFuture;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ThrowableUtil.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/ThrowableUtil.java
index 075a65c5..bf8ed35b 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ThrowableUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/TranslatorUtil.java
similarity index 98%
rename from eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/TranslatorUtil.java
index f2bd5d2d..f88e480f 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/TranslatorUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.json.JSONArray;
import java.io.BufferedReader;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ValidationUtil.java
similarity index 93%
rename from eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/ValidationUtil.java
index e561762b..944dc5d9 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/ValidationUtil.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ObjectUtil;
-import me.zhengjie.exception.BadRequestException;
+import cn.ysk.cashier.exception.BadRequestException;
/**
* 验证工具
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeBiEnum.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeBiEnum.java
index 944bc71c..cafc03b5 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeBiEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils.enums;
+package cn.ysk.cashier.utils.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeEnum.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeEnum.java
index 916862a6..d64dc669 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/CodeEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils.enums;
+package cn.ysk.cashier.utils.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/DataScopeEnum.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/DataScopeEnum.java
index 465eef65..d850a26a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/DataScopeEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils.enums;
+package cn.ysk.cashier.utils.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/RequestMethodEnum.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
rename to eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/RequestMethodEnum.java
index 7de5146c..925ea2da 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/enums/RequestMethodEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils.enums;
+package cn.ysk.cashier.utils.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java b/eladmin-common/src/test/java/cn/ysk/cashier/utils/DateUtilsTest.java
similarity index 96%
rename from eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java
rename to eladmin-common/src/test/java/cn/ysk/cashier/utils/DateUtilsTest.java
index dfe01e09..0492394c 100644
--- a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java
+++ b/eladmin-common/src/test/java/cn/ysk/cashier/utils/DateUtilsTest.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.junit.jupiter.api.Test;
diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java b/eladmin-common/src/test/java/cn/ysk/cashier/utils/EncryptUtilsTest.java
similarity index 88%
rename from eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java
rename to eladmin-common/src/test/java/cn/ysk/cashier/utils/EncryptUtilsTest.java
index 3ec73752..1a3ed161 100644
--- a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java
+++ b/eladmin-common/src/test/java/cn/ysk/cashier/utils/EncryptUtilsTest.java
@@ -1,8 +1,8 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.junit.jupiter.api.Test;
-import static me.zhengjie.utils.EncryptUtils.*;
+import static cn.ysk.cashier.utils.EncryptUtils.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class EncryptUtilsTest {
diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java b/eladmin-common/src/test/java/cn/ysk/cashier/utils/FileUtilTest.java
similarity index 92%
rename from eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java
rename to eladmin-common/src/test/java/cn/ysk/cashier/utils/FileUtilTest.java
index 48e06bd7..d34a3dfe 100644
--- a/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java
+++ b/eladmin-common/src/test/java/cn/ysk/cashier/utils/FileUtilTest.java
@@ -1,9 +1,9 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockMultipartFile;
-import static me.zhengjie.utils.FileUtil.*;
+import static cn.ysk.cashier.utils.FileUtil.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class FileUtilTest {
diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java b/eladmin-common/src/test/java/cn/ysk/cashier/utils/StringUtilsTest.java
similarity index 78%
rename from eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java
rename to eladmin-common/src/test/java/cn/ysk/cashier/utils/StringUtilsTest.java
index ffb2cf88..2f5e2a63 100644
--- a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java
+++ b/eladmin-common/src/test/java/cn/ysk/cashier/utils/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -6,11 +6,11 @@ import org.springframework.mock.web.MockHttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.Date;
-import static me.zhengjie.utils.StringUtils.getIp;
-import static me.zhengjie.utils.StringUtils.getWeekDay;
-import static me.zhengjie.utils.StringUtils.toCamelCase;
-import static me.zhengjie.utils.StringUtils.toCapitalizeCamelCase;
-import static me.zhengjie.utils.StringUtils.toUnderScoreCase;
+import static cn.ysk.cashier.utils.StringUtils.getIp;
+import static cn.ysk.cashier.utils.StringUtils.getWeekDay;
+import static cn.ysk.cashier.utils.StringUtils.toCamelCase;
+import static cn.ysk.cashier.utils.StringUtils.toCapitalizeCamelCase;
+import static cn.ysk.cashier.utils.StringUtils.toUnderScoreCase;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
index 96089616..9a3b4636 100644
--- a/eladmin-generator/pom.xml
+++ b/eladmin-generator/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
eladmin
- me.zhengjie
+ cn.ysk.cashier2.64.0.0
@@ -18,7 +18,7 @@
- me.zhengjie
+ cn.ysk.cashiereladmin-common2.6
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/ColumnInfo.java
similarity index 97%
rename from eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/domain/ColumnInfo.java
index fdb962a4..edf05274 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/ColumnInfo.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import me.zhengjie.utils.GenUtil;
+import cn.ysk.cashier.utils.GenUtil;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/GenConfig.java
similarity index 98%
rename from eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/domain/GenConfig.java
index a2d67063..80f4a0c5 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/GenConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/vo/TableInfo.java
similarity index 96%
rename from eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/domain/vo/TableInfo.java
index 1d3967b5..e35307a4 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/domain/vo/TableInfo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain.vo;
+package cn.ysk.cashier.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java b/eladmin-generator/src/main/java/cn/ysk/cashier/repository/ColumnInfoRepository.java
similarity index 92%
rename from eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/repository/ColumnInfoRepository.java
index 4638be26..1332eaec 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/repository/ColumnInfoRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.ColumnInfo;
+import cn.ysk.cashier.domain.ColumnInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/cn/ysk/cashier/repository/GenConfigRepository.java
similarity index 92%
rename from eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/repository/GenConfigRepository.java
index 18c9a0c8..e876ea03 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/repository/GenConfigRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.GenConfig;
+import cn.ysk.cashier.domain.GenConfig;
import org.springframework.data.jpa.repository.JpaRepository;
/**
diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/cn/ysk/cashier/rest/GenConfigController.java
similarity index 93%
rename from eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/rest/GenConfigController.java
index 1c099993..b809951a 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/rest/GenConfigController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.domain.GenConfig;
+import cn.ysk.cashier.service.GenConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.service.GenConfigService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/cn/ysk/cashier/rest/GeneratorController.java
similarity index 94%
rename from eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/rest/GeneratorController.java
index bfdfecc0..605e1aba 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/rest/GeneratorController.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.domain.ColumnInfo;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.service.GenConfigService;
+import cn.ysk.cashier.service.GeneratorService;
+import cn.ysk.cashier.utils.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.ColumnInfo;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.service.GenConfigService;
-import me.zhengjie.service.GeneratorService;
-import me.zhengjie.utils.PageUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java b/eladmin-generator/src/main/java/cn/ysk/cashier/service/GenConfigService.java
similarity index 93%
rename from eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/service/GenConfigService.java
index b5711f48..dff9ce8c 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/service/GenConfigService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.GenConfig;
+import cn.ysk.cashier.domain.GenConfig;
/**
* @author Zheng Jie
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/cn/ysk/cashier/service/GeneratorService.java
similarity index 93%
rename from eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/service/GeneratorService.java
index b5a1e0a5..be248274 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/service/GeneratorService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.domain.ColumnInfo;
+import cn.ysk.cashier.domain.GenConfig;
+import cn.ysk.cashier.domain.ColumnInfo;
import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GenConfigServiceImpl.java
similarity index 90%
rename from eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GenConfigServiceImpl.java
index bc2d061d..e4456a1d 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GenConfigServiceImpl.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.repository.GenConfigRepository;
-import me.zhengjie.service.GenConfigService;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.domain.GenConfig;
+import cn.ysk.cashier.repository.GenConfigRepository;
+import cn.ysk.cashier.service.GenConfigService;
import org.springframework.stereotype.Service;
import java.io.File;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GeneratorServiceImpl.java
similarity index 94%
rename from eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GeneratorServiceImpl.java
index 0341b115..e1823c70 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/service/impl/GeneratorServiceImpl.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.domain.ColumnInfo;
-import me.zhengjie.domain.vo.TableInfo;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.ColumnInfoRepository;
-import me.zhengjie.service.GeneratorService;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.GenUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.domain.GenConfig;
+import cn.ysk.cashier.domain.ColumnInfo;
+import cn.ysk.cashier.domain.vo.TableInfo;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.repository.ColumnInfoRepository;
+import cn.ysk.cashier.service.GeneratorService;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.GenUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java b/eladmin-generator/src/main/java/cn/ysk/cashier/utils/ColUtil.java
similarity index 98%
rename from eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/utils/ColUtil.java
index b5fcd6b7..7528d50d 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/utils/ColUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import org.apache.commons.configuration.*;
import org.slf4j.Logger;
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/cn/ysk/cashier/utils/GenUtil.java
similarity index 99%
rename from eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
rename to eladmin-generator/src/main/java/cn/ysk/cashier/utils/GenUtil.java
index b62efa2d..52516b12 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
+++ b/eladmin-generator/src/main/java/cn/ysk/cashier/utils/GenUtil.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.template.*;
+import cn.ysk.cashier.domain.ColumnInfo;
+import cn.ysk.cashier.domain.GenConfig;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.domain.ColumnInfo;
import org.springframework.util.ObjectUtils;
import java.io.File;
@@ -29,7 +29,7 @@ import java.io.Writer;
import java.time.LocalDate;
import java.util.*;
-import static me.zhengjie.utils.FileUtil.SYS_TEM_DIR;
+import static cn.ysk.cashier.utils.FileUtil.SYS_TEM_DIR;
/**
* 代码生成
diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml
index a713b3f8..50ede49a 100644
--- a/eladmin-logging/pom.xml
+++ b/eladmin-logging/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
eladmin
- me.zhengjie
+ cn.ysk.cashier2.64.0.0
@@ -14,7 +14,7 @@
- me.zhengjie
+ cn.ysk.cashiereladmin-common2.6
diff --git a/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java b/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java
similarity index 96%
rename from eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java
index 6c001cd3..e5868b13 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/annotation/Log.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
similarity index 89%
rename from eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
index 53e4532b..043e3b4c 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.aspect;
+package cn.ysk.cashier.aspect;
+import cn.ysk.cashier.domain.Log;
+import cn.ysk.cashier.service.LogService;
+import cn.ysk.cashier.utils.RequestHolder;
+import cn.ysk.cashier.utils.SecurityUtils;
+import cn.ysk.cashier.utils.StringUtils;
+import cn.ysk.cashier.utils.ThrowableUtil;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.domain.Log;
-import me.zhengjie.service.LogService;
-import me.zhengjie.utils.RequestHolder;
-import me.zhengjie.utils.SecurityUtils;
-import me.zhengjie.utils.StringUtils;
-import me.zhengjie.utils.ThrowableUtil;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
@@ -51,7 +51,7 @@ public class LogAspect {
/**
* 配置切入点
*/
- @Pointcut("@annotation(me.zhengjie.annotation.Log)")
+ @Pointcut("@annotation(cn.ysk.cashier.annotation.Log)")
public void logPointcut() {
// 该方法无方法体,主要为了让同类中其他方法使用此切入点
}
diff --git a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java b/eladmin-logging/src/main/java/cn/ysk/cashier/domain/Log.java
similarity index 98%
rename from eladmin-logging/src/main/java/me/zhengjie/domain/Log.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/domain/Log.java
index 88dad027..80f09e8e 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/domain/Log.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java b/eladmin-logging/src/main/java/cn/ysk/cashier/repository/LogRepository.java
similarity index 94%
rename from eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/repository/LogRepository.java
index f7fc10e5..4bbb183e 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/repository/LogRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.Log;
+import cn.ysk.cashier.domain.Log;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java b/eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java
similarity index 95%
rename from eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java
index d4101449..a993cf9e 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/rest/LogController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.service.LogService;
+import cn.ysk.cashier.service.dto.LogQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.service.LogService;
-import me.zhengjie.service.dto.LogQueryCriteria;
-import me.zhengjie.utils.SecurityUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/LogService.java
similarity index 95%
rename from eladmin-logging/src/main/java/me/zhengjie/service/LogService.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/LogService.java
index d74dce68..62305f69 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/LogService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.Log;
-import me.zhengjie.service.dto.LogQueryCriteria;
+import cn.ysk.cashier.service.dto.LogQueryCriteria;
+import cn.ysk.cashier.domain.Log;
import org.aspectj.lang.ProceedingJoinPoint;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogErrorDTO.java
similarity index 96%
rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogErrorDTO.java
index bc0d4ec2..2f6fda3d 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogErrorDTO.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogQueryCriteria.java
similarity index 93%
rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogQueryCriteria.java
index 83406079..5843a6ff 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogSmallDTO.java
similarity index 96%
rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogSmallDTO.java
index d074fd15..99433b2e 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/dto/LogSmallDTO.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
similarity index 93%
rename from eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
index 6d2d6611..aa62b09a 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
@@ -13,20 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import cn.ysk.cashier.domain.Log;
+import cn.ysk.cashier.repository.LogRepository;
+import cn.ysk.cashier.service.LogService;
+import cn.ysk.cashier.service.dto.LogQueryCriteria;
+import cn.ysk.cashier.service.mapstruct.LogErrorMapper;
+import cn.ysk.cashier.service.mapstruct.LogSmallMapper;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.Log;
-import me.zhengjie.repository.LogRepository;
-import me.zhengjie.service.LogService;
-import me.zhengjie.service.dto.LogQueryCriteria;
-import me.zhengjie.service.mapstruct.LogErrorMapper;
-import me.zhengjie.service.mapstruct.LogSmallMapper;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.utils.*;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.data.domain.Page;
@@ -82,7 +83,7 @@ public class LogServiceImpl implements LogService {
}
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
- me.zhengjie.annotation.Log aopLog = method.getAnnotation(me.zhengjie.annotation.Log.class);
+ cn.ysk.cashier.annotation.Log aopLog = method.getAnnotation(cn.ysk.cashier.annotation.Log.class);
// 方法路径
String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogErrorMapper.java
similarity index 84%
rename from eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogErrorMapper.java
index 3ae02c90..38a6806f 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogErrorMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.mapstruct;
+package cn.ysk.cashier.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.domain.Log;
-import me.zhengjie.service.dto.LogErrorDTO;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.domain.Log;
+import cn.ysk.cashier.service.dto.LogErrorDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogSmallMapper.java
similarity index 84%
rename from eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java
rename to eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogSmallMapper.java
index 9f2972ad..a26708d5 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/mapstruct/LogSmallMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.mapstruct;
+package cn.ysk.cashier.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.domain.Log;
-import me.zhengjie.service.dto.LogSmallDTO;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.domain.Log;
+import cn.ysk.cashier.service.dto.LogSmallDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 71bc491b..6ffd37ef 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
eladmin
- me.zhengjie
+ cn.ysk.cashier2.64.0.0
@@ -21,12 +21,12 @@
- me.zhengjie
+ cn.ysk.cashiereladmin-generator2.6
- me.zhengjie
+ cn.ysk.cashiereladmin-common
@@ -34,7 +34,7 @@
- me.zhengjie
+ cn.ysk.cashiereladmin-tools2.6
diff --git a/eladmin-system/src/assembly/startup.sh b/eladmin-system/src/assembly/startup.sh
index 917b1a53..62ad347d 100644
--- a/eladmin-system/src/assembly/startup.sh
+++ b/eladmin-system/src/assembly/startup.sh
@@ -7,4 +7,4 @@ for file in $baseDir/libs/*.jar
do
cp=$cp:$file
done
-java -cp $cp me.zhengjie.AppRun >>stdout.out 2>&1 &
+java -cp $cp cn.ysk.cashier.AppRun >>stdout.out 2>&1 &
diff --git a/eladmin-system/src/main/java/me/zhengjie/AppRun.java b/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/AppRun.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java
index a3cd32fc..5dcaa94a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/AppRun.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/AppRun.java
@@ -13,16 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie;
+package cn.ysk.cashier;
import io.swagger.annotations.Api;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.utils.SpringContextHolder;
+import cn.ysk.cashier.annotation.rest.AnonymousGetMapping;
+import cn.ysk.cashier.utils.SpringContextHolder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.ApplicationPidFileWriter;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/ConfigurerAdapter.java
similarity index 99%
rename from eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/ConfigurerAdapter.java
index ce0c2678..512883df 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/ConfigurerAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.support.config.FastJsonConfig;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/JacksonConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/JacksonConfig.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/config/JacksonConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/JacksonConfig.java
index c42ea416..d685466f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/JacksonConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/JacksonConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import org.springframework.context.annotation.Configuration;
import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/RelaxedQueryCharsConnectorCustomizer b/eladmin-system/src/main/java/cn/ysk/cashier/config/RelaxedQueryCharsConnectorCustomizer
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/config/RelaxedQueryCharsConnectorCustomizer
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/RelaxedQueryCharsConnectorCustomizer
index 2ca2ad47..fdef1581 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/RelaxedQueryCharsConnectorCustomizer
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/RelaxedQueryCharsConnectorCustomizer
@@ -1,4 +1,4 @@
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import org.apache.catalina.connector.Connector;
import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/WebSocketConfig.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/WebSocketConfig.java
index f55f5c60..ee33435f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/WebSocketConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/fastJsonConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/config/fastJsonConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java
index 8dfc04f1..e675ebfe 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/fastJsonConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.support.config.FastJsonConfig;
diff --git a/eladmin-system/src/main/java/me/zhengjie/interceptor/UserInterceptor.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/UserInterceptor.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/interceptor/UserInterceptor.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/UserInterceptor.java
index 04228cc2..e2574390 100644
--- a/eladmin-system/src/main/java/me/zhengjie/interceptor/UserInterceptor.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/UserInterceptor.java
@@ -1,4 +1,4 @@
-package me.zhengjie.interceptor;
+package cn.ysk.cashier.config.interceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
diff --git a/eladmin-system/src/main/java/me/zhengjie/interceptor/WebConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/WebConfig.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/interceptor/WebConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/WebConfig.java
index c50e6f59..37878f29 100644
--- a/eladmin-system/src/main/java/me/zhengjie/interceptor/WebConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/interceptor/WebConfig.java
@@ -1,4 +1,4 @@
-package me.zhengjie.interceptor;
+package cn.ysk.cashier.config.interceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/ConfigBeanConfiguration.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/ConfigBeanConfiguration.java
index 8cbc88dd..d53789c6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/ConfigBeanConfiguration.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config;
+package cn.ysk.cashier.config.security.config;
-import me.zhengjie.modules.security.config.bean.LoginProperties;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
+import cn.ysk.cashier.config.security.config.bean.LoginProperties;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/SpringSecurityConfig.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/SpringSecurityConfig.java
index 61a8027e..513949f0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/SpringSecurityConfig.java
@@ -13,15 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config;
+package cn.ysk.cashier.config.security.config;
+import cn.ysk.cashier.config.security.security.JwtAccessDeniedHandler;
+import cn.ysk.cashier.config.security.security.JwtAuthenticationEntryPoint;
+import cn.ysk.cashier.config.security.security.TokenConfigurer;
+import cn.ysk.cashier.config.security.security.TokenProvider;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.AnonymousAccess;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.modules.security.security.*;
-import me.zhengjie.modules.security.service.OnlineUserService;
-import me.zhengjie.modules.security.service.UserCacheManager;
-import me.zhengjie.utils.enums.RequestMethodEnum;
+import cn.ysk.cashier.annotation.AnonymousAccess;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
+
+import cn.ysk.cashier.config.security.service.OnlineUserService;
+import cn.ysk.cashier.config.security.service.UserCacheManager;
+import cn.ysk.cashier.utils.enums.RequestMethodEnum;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCode.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCode.java
index fefd252b..e19cdca5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCode.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config.bean;
+package cn.ysk.cashier.config.security.config.bean;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCodeEnum.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCodeEnum.java
index 685ccbbb..2f3a6f9d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginCodeEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config.bean;
+package cn.ysk.cashier.config.security.config.bean;
/**
* 验证码配置枚举
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
index 164c0073..a0b9eb26 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config.bean;
+package cn.ysk.cashier.config.security.config.bean;
import com.wf.captcha.*;
import com.wf.captcha.base.Captcha;
import lombok.Data;
-import me.zhengjie.exception.BadConfigurationException;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.exception.BadConfigurationException;
+import cn.ysk.cashier.utils.StringUtils;
import java.awt.*;
import java.util.Objects;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/SecurityProperties.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/SecurityProperties.java
index 16ec3cf0..f7f935e1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/SecurityProperties.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.config.bean;
+package cn.ysk.cashier.config.security.config.bean;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
index 2f54c21d..91f1dd09 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java
@@ -13,33 +13,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.rest;
+package cn.ysk.cashier.config.security.rest;
import cn.hutool.core.util.IdUtil;
+import cn.ysk.cashier.config.security.config.bean.LoginCodeEnum;
+import cn.ysk.cashier.config.security.security.TokenProvider;
import com.wf.captcha.base.Captcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.annotation.rest.AnonymousDeleteMapping;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.config.RsaProperties;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.security.config.bean.LoginCodeEnum;
-import me.zhengjie.modules.security.config.bean.LoginProperties;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.modules.security.security.TokenProvider;
-import me.zhengjie.modules.security.service.dto.AuthUserDto;
-import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.security.service.OnlineUserService;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shop.repository.TbShopInfoRepository;
-import me.zhengjie.utils.RsaUtils;
-import me.zhengjie.utils.RedisUtils;
-import me.zhengjie.utils.SecurityUtils;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.annotation.rest.AnonymousDeleteMapping;
+import cn.ysk.cashier.annotation.rest.AnonymousGetMapping;
+import cn.ysk.cashier.annotation.rest.AnonymousPostMapping;
+import cn.ysk.cashier.config.RsaProperties;
+import cn.ysk.cashier.exception.BadRequestException;
+
+import cn.ysk.cashier.config.security.config.bean.LoginProperties;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
+import cn.ysk.cashier.config.security.service.dto.AuthUserDto;
+import cn.ysk.cashier.config.security.service.dto.JwtUserDto;
+import cn.ysk.cashier.config.security.service.OnlineUserService;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
+import cn.ysk.cashier.utils.RsaUtils;
+import cn.ysk.cashier.utils.RedisUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
+import cn.ysk.cashier.utils.StringUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/OnlineController.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/OnlineController.java
index 8b91fdfd..1367ba4e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/OnlineController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.rest;
+package cn.ysk.cashier.config.security.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.security.service.OnlineUserService;
-import me.zhengjie.utils.EncryptUtils;
+import cn.ysk.cashier.config.security.service.OnlineUserService;
+import cn.ysk.cashier.utils.EncryptUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAccessDeniedHandler.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAccessDeniedHandler.java
index 8b3f8c17..02906a0c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAccessDeniedHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.security;
+package cn.ysk.cashier.config.security.security;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.web.access.AccessDeniedHandler;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAuthenticationEntryPoint.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAuthenticationEntryPoint.java
index 91a45093..a4fcd628 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/JwtAuthenticationEntryPoint.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.security;
+package cn.ysk.cashier.config.security.security;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenConfigurer.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenConfigurer.java
index cff5e1ed..bc9378db 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenConfigurer.java
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.security;
+package cn.ysk.cashier.config.security.security;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
+import cn.ysk.cashier.config.security.service.OnlineUserService;
+import cn.ysk.cashier.config.security.service.UserCacheManager;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.modules.security.service.OnlineUserService;
-import me.zhengjie.modules.security.service.UserCacheManager;
+
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.DefaultSecurityFilterChain;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenFilter.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenFilter.java
index d235cb81..81b14339 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenFilter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.security;
+package cn.ysk.cashier.config.security.security;
import cn.hutool.core.util.StrUtil;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
import io.jsonwebtoken.ExpiredJwtException;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.modules.security.service.UserCacheManager;
-import me.zhengjie.modules.security.service.dto.OnlineUserDto;
-import me.zhengjie.modules.security.service.OnlineUserService;
+import cn.ysk.cashier.config.security.service.UserCacheManager;
+import cn.ysk.cashier.config.security.service.dto.OnlineUserDto;
+import cn.ysk.cashier.config.security.service.OnlineUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java
index db98fba4..35fb7ec1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/security/TokenProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.security;
+package cn.ysk.cashier.config.security.security;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
@@ -22,8 +22,8 @@ import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.security.Keys;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.utils.RedisUtils;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
+import cn.ysk.cashier.utils.RedisUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/OnlineUserService.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/OnlineUserService.java
index af8d2986..4ba914f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/OnlineUserService.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service;
+package cn.ysk.cashier.config.security.service;
+import cn.ysk.cashier.config.security.config.bean.SecurityProperties;
+import cn.ysk.cashier.config.security.service.dto.JwtUserDto;
+import cn.ysk.cashier.utils.*;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.security.config.bean.SecurityProperties;
-import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.security.service.dto.OnlineUserDto;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.config.security.service.dto.OnlineUserDto;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserCacheManager.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserCacheManager.java
index 3a8afe72..24bc8ac2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserCacheManager.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service;
+package cn.ysk.cashier.config.security.service;
import cn.hutool.core.util.RandomUtil;
-import me.zhengjie.modules.security.config.bean.LoginProperties;
-import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.utils.RedisUtils;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.config.security.config.bean.LoginProperties;
+import cn.ysk.cashier.config.security.service.dto.JwtUserDto;
+import cn.ysk.cashier.utils.RedisUtils;
+import cn.ysk.cashier.utils.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserDetailsServiceImpl.java
similarity index 84%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserDetailsServiceImpl.java
index 70db5df0..2eab6444 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/UserDetailsServiceImpl.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service;
+package cn.ysk.cashier.config.security.service;
+import cn.ysk.cashier.config.security.service.dto.JwtUserDto;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.exception.EntityNotFoundException;
-import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.system.service.DataService;
-import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.UserService;
-import me.zhengjie.modules.system.service.dto.UserLoginDto;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.exception.EntityNotFoundException;
+import cn.ysk.cashier.system.service.DataService;
+import cn.ysk.cashier.system.service.RoleService;
+import cn.ysk.cashier.system.service.UserService;
+import cn.ysk.cashier.system.service.dto.UserLoginDto;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthUserDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthUserDto.java
index 5219fc53..9969bb6d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthUserDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service.dto;
+package cn.ysk.cashier.config.security.service.dto;
import lombok.Getter;
import lombok.Setter;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthorityDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthorityDto.java
index 888cceb6..eb64ff22 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/AuthorityDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service.dto;
+package cn.ysk.cashier.config.security.service.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/JwtUserDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/JwtUserDto.java
index 5aa0c45f..f8fd6c59 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/JwtUserDto.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service.dto;
+package cn.ysk.cashier.config.security.service.dto;
+import cn.ysk.cashier.system.service.dto.UserLoginDto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Getter;
-import me.zhengjie.modules.system.service.dto.UserLoginDto;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.List;
import java.util.Set;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/OnlineUserDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/OnlineUserDto.java
index 290ab6d6..6b29a1d0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/OnlineUserDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.security.service.dto;
+package cn.ysk.cashier.config.security.service.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskExecutePool.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskExecutePool.java
index dc9d1bc3..422caee5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskExecutePool.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config.thread;
+package cn.ysk.cashier.config.thread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskProperties.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskProperties.java
index 6e075eab..9392b1bc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/AsyncTaskProperties.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config.thread;
+package cn.ysk.cashier.config.thread;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/TheadFactoryName.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/thread/TheadFactoryName.java
index be227fd5..a1630d04 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/TheadFactoryName.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config.thread;
+package cn.ysk.cashier.config.thread;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.utils.StringUtils;
import org.springframework.stereotype.Component;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/ThreadPoolExecutorUtil.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/config/thread/ThreadPoolExecutorUtil.java
index dc93fe51..25cefb97 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/thread/ThreadPoolExecutorUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config.thread;
+package cn.ysk.cashier.config.thread;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotButtonConfigController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotButtonConfigController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java
index dbb81d4e..39f4247c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotButtonConfigController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.bot.domain.BotButtonConfig;
-import me.zhengjie.modules.bot.service.BotButtonConfigService;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.BotButtonConfig;
+import cn.ysk.cashier.service.BotButtonConfigService;
+import cn.ysk.cashier.dto.BotButtonConfigQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotConfigController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotConfigController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java
index 3701026a..2368e53f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/rest/BotConfigController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.bot.domain.BotConfig;
-import me.zhengjie.modules.bot.service.BotConfigService;
-import me.zhengjie.modules.bot.service.dto.BotConfigQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.BotConfig;
+import cn.ysk.cashier.service.BotConfigService;
+import cn.ysk.cashier.dto.BotConfigQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/rest/BotUserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/rest/BotUserController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java
index 28fec5b9..c5104bfc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/rest/BotUserController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.user.domain.BotUser;
-import me.zhengjie.modules.user.service.BotUserService;
-import me.zhengjie.modules.user.service.dto.BotUserQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.BotUser;
+import cn.ysk.cashier.service.BotUserService;
+import cn.ysk.cashier.dto.BotUserQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/rest/BotUserFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/rest/BotUserFlowController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java
index 37373dc6..8ae3aad3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/rest/BotUserFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.account.domain.BotUserFlow;
-import me.zhengjie.modules.account.service.BotUserFlowService;
-import me.zhengjie.modules.account.service.dto.BotUserFlowQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.BotUserFlow;
+import cn.ysk.cashier.service.BotUserFlowService;
+import cn.ysk.cashier.dto.BotUserFlowQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/rest/TbRenewalsPayLogController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/rest/TbRenewalsPayLogController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java
index 47afa4e6..57fb516b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/rest/TbRenewalsPayLogController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.renewals.domain.TbRenewalsPayLog;
-import me.zhengjie.modules.renewals.service.TbRenewalsPayLogService;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.TbRenewalsPayLog;
+import cn.ysk.cashier.service.TbRenewalsPayLogService;
+import cn.ysk.cashier.dto.TbRenewalsPayLogQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/rest/TbShopPayTypeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/rest/TbShopPayTypeController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java
index 2cc0ad12..3b975ed6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/rest/TbShopPayTypeController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.payType.domain.TbShopPayType;
-import me.zhengjie.modules.payType.service.TbShopPayTypeService;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.TbShopPayType;
+import cn.ysk.cashier.service.TbShopPayTypeService;
+import cn.ysk.cashier.dto.TbShopPayTypeQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/rest/TbUserInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/rest/TbUserInfoController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java
index 45d15dde..fa6a5763 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/rest/TbUserInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.rest;
+package cn.ysk.cashier.controller;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
-import me.zhengjie.modules.userInfo.service.TbUserInfoService;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.TbUserInfo;
+import cn.ysk.cashier.service.TbUserInfoService;
+import cn.ysk.cashier.dto.TbUserInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/rest/TbCashierCartController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/rest/TbCashierCartController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java
index 4c521dba..f1ba8751 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/rest/TbCashierCartController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.rest;
+package cn.ysk.cashier.controller.order;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
-import me.zhengjie.modules.order.cashierCart.service.TbCashierCartService;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.service.order.TbCashierCartService;
+import cn.ysk.cashier.dto.order.TbCashierCartQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/rest/TbOrderDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/rest/TbOrderDetailController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java
index 04527bc7..29d65dfa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/rest/TbOrderDetailController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.rest;
+package cn.ysk.cashier.controller.order;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.order.orderDetail.domain.TbOrderDetail;
-import me.zhengjie.modules.order.orderDetail.service.TbOrderDetailService;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.order.TbOrderDetail;
+import cn.ysk.cashier.service.order.TbOrderDetailService;
+import cn.ysk.cashier.dto.order.TbOrderDetailQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/rest/TbOrderInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/rest/TbOrderInfoController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
index 853862b6..1d6e003c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/rest/TbOrderInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.rest;
+package cn.ysk.cashier.controller.order;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.order.orderInfo.domain.TbOrderInfo;
-import me.zhengjie.modules.order.orderInfo.service.TbOrderInfoService;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.order.TbOrderInfo;
+import cn.ysk.cashier.service.order.TbOrderInfoService;
+import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/rest/TbProductController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/rest/TbProductController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
index 85bc42f3..2987e2f7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/rest/TbProductController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.product.domain.TbProductVo;
-import me.zhengjie.modules.productInfo.product.service.TbProductService;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.vo.TbProductVo;
+import cn.ysk.cashier.service.product.TbProductService;
+import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/rest/TbProductGroupController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/rest/TbProductGroupController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java
index 91e0958e..8614149f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/rest/TbProductGroupController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.product.service.TbProductService;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductQueryCriteria;
-import me.zhengjie.modules.productInfo.productGroup.domain.TbProductGroup;
-import me.zhengjie.modules.productInfo.productGroup.service.TbProductGroupService;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupQueryCriteria;
-import me.zhengjie.modules.productInfo.productGroup.service.vo.AddProduct;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.service.product.TbProductService;
+import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbProductGroup;
+import cn.ysk.cashier.service.product.TbProductGroupService;
+import cn.ysk.cashier.dto.product.TbProductGroupQueryCriteria;
+import cn.ysk.cashier.vo.AddProduct;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/rest/TbProductSkuController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/rest/TbProductSkuController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java
index 6a928c80..421e3f27 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/rest/TbProductSkuController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuQueryCriteria;
-import me.zhengjie.modules.productInfo.productSku.service.TbProductSkuService;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.dto.product.TbProductSkuQueryCriteria;
+import cn.ysk.cashier.service.product.TbProductSkuService;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/rest/TbProductSkuResultController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/rest/TbProductSkuResultController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java
index 0fc5c64a..c83f85f1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/rest/TbProductSkuResultController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
-import me.zhengjie.modules.productInfo.productSkuResult.service.TbProductSkuResultService;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
+import cn.ysk.cashier.service.product.TbProductSkuResultService;
+import cn.ysk.cashier.dto.product.TbProductSkuResultQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/rest/TbProductSpecController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/rest/TbProductSpecController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java
index 8a953c4c..29bc2b10 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/rest/TbProductSpecController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
-import me.zhengjie.modules.productInfo.productSpec.service.TbProductSpecService;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.SpecDto;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
+import cn.ysk.cashier.service.product.TbProductSpecService;
+import cn.ysk.cashier.dto.product.SpecDto;
+import cn.ysk.cashier.dto.product.TbProductSpecQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java
index 9b3de685..aee53f17 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/rest/TbProductStockDetailController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import me.zhengjie.modules.productInfo.productStock.service.TbProductStockDetailService;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
+import cn.ysk.cashier.service.product.TbProductStockDetailService;
+import cn.ysk.cashier.dto.product.TbProductStockDetailQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
index f7960bb1..a327c874 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/rest/TbProductStockOperateController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productStockOperate.domain.TbProductStockOperate;
-import me.zhengjie.modules.productInfo.productStockOperate.service.TbProductStockOperateService;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.OutAndOnDto;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateQueryCriteria;
-import org.springframework.data.domain.Pageable;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbProductStockOperate;
+import cn.ysk.cashier.service.TbProductStockOperateService;
+import cn.ysk.cashier.dto.product.OutAndOnDto;
+import cn.ysk.cashier.dto.product.TbProductStockOperateQueryCriteria;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/rest/TbShopCategoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/rest/TbShopCategoryController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java
index 576a4d39..789de372 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/rest/TbShopCategoryController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.rest;
+package cn.ysk.cashier.controller.product;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
-import me.zhengjie.modules.productInfo.productCategory.service.TbShopCategoryService;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
+import cn.ysk.cashier.service.product.TbShopCategoryService;
+import cn.ysk.cashier.dto.product.TbShopCategoryQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/rest/TbMerchantAccountController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/rest/TbMerchantAccountController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java
index d6f649f5..60fb7c09 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/rest/TbMerchantAccountController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.TbMerchantAccountService;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.service.shop.TbMerchantAccountService;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/rest/TbMerchantRegisterController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java
similarity index 84%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/rest/TbMerchantRegisterController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java
index a7ba3400..8edcf87e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/rest/TbMerchantRegisterController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
-import me.zhengjie.modules.shopInfo.shopRegister.service.TbMerchantRegisterService;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterQueryCriteria;
-import org.springframework.data.domain.Pageable;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
+import cn.ysk.cashier.service.shop.TbMerchantRegisterService;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterQueryCriteria;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -28,8 +27,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/rest/TbMerchantThirdApplyController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/rest/TbMerchantThirdApplyController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java
index a81b7c94..fa0ddb25 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/rest/TbMerchantThirdApplyController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopThirdApply.domain.TbMerchantThirdApply;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.TbMerchantThirdApplyService;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyDto;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.service.shop.TbMerchantThirdApplyService;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyDto;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/rest/TbPlussShopStaffController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/rest/TbPlussShopStaffController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java
index 9076aff9..f0e28ecc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/rest/TbPlussShopStaffController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
-import me.zhengjie.modules.shopInfo.shopStaff.service.TbPlussShopStaffService;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
+import cn.ysk.cashier.service.shop.TbPlussShopStaffService;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/domain/TbPrintMachine.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/domain/TbPrintMachine.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java
index 11ff7c14..dc98786b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/domain/TbPrintMachine.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.domain;
+package cn.ysk.cashier.controller.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/rest/TbPrintMachineController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/rest/TbPrintMachineController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java
index 47f150cc..93e67ade 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/rest/TbPrintMachineController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachineController.java
@@ -13,24 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopPrint.domain.TbPrintMachine;
-import me.zhengjie.modules.shopInfo.shopPrint.service.TbPrintMachineService;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.PrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.service.shop.TbPrintMachineService;
+import cn.ysk.cashier.dto.shop.PrintMachineDto;
+import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/rest/TbReceiptSalesController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/rest/TbReceiptSalesController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java
index 51cc5a8c..c019be66 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/rest/TbReceiptSalesController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.domain.TbReceiptSales;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.TbReceiptSalesService;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbReceiptSales;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesQueryCriteria;
+import cn.ysk.cashier.service.shop.TbReceiptSalesService;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/rest/TbShopAreaController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/rest/TbShopAreaController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java
index 62294fb0..25f27a37 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/rest/TbShopAreaController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopArea.domain.TbShopArea;
-import me.zhengjie.modules.shopInfo.shopArea.service.TbShopAreaService;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopArea;
+import cn.ysk.cashier.service.shop.TbShopAreaService;
+import cn.ysk.cashier.dto.shop.TbShopAreaQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/rest/TbShopCashSpreadController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/rest/TbShopCashSpreadController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java
index b830cbf2..5d5fd9ef 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/rest/TbShopCashSpreadController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopSpread.domain.TbShopCashSpread;
-import me.zhengjie.modules.shopInfo.shopSpread.service.TbShopCashSpreadService;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadQueryCriteria;
-import me.zhengjie.utils.StringUtils;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopCashSpread;
+import cn.ysk.cashier.service.shop.TbShopCashSpreadService;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadQueryCriteria;
+import cn.ysk.cashier.utils.StringUtils;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/rest/TbShopCurrencyController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/rest/TbShopCurrencyController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java
index 0e9c8f6b..862f1987 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/rest/TbShopCurrencyController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCurrencyController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopCurrency.domain.TbShopCurrency;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.TbShopCurrencyService;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopCurrency;
+import cn.ysk.cashier.service.shop.TbShopCurrencyService;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/rest/TbShopInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/rest/TbShopInfoController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java
index cd8a3e4d..e8d8f40f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/rest/TbShopInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shop.service.TbShopInfoService;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoDto;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.service.shop.TbShopInfoService;
+import cn.ysk.cashier.dto.shop.TbShopInfoDto;
+import cn.ysk.cashier.dto.shop.TbShopInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/rest/TbShopPurveyorController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/rest/TbShopPurveyorController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java
index c138eac0..92df0e3f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/rest/TbShopPurveyorController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.TbShopPurveyorService;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
+import cn.ysk.cashier.service.shop.TbShopPurveyorService;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/rest/TbShopPurveyorTransactController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/rest/TbShopPurveyorTransactController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java
index e21d8230..13809c30 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/rest/TbShopPurveyorTransactController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.TbShopPurveyorTransactService;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
+import cn.ysk.cashier.service.shop.TbShopPurveyorTransactService;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/rest/TbShopTableController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/rest/TbShopTableController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
index b866c9b4..83d481f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/rest/TbShopTableController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.table.domain.TbShopTable;
-import me.zhengjie.modules.shopInfo.table.service.TbShopTableService;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
+import cn.ysk.cashier.service.shop.TbShopTableService;
+import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/rest/TbShopUnitController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/rest/TbShopUnitController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java
index e9d8bfb2..7a38a6f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/rest/TbShopUnitController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
-import me.zhengjie.modules.shopInfo.shopUnit.service.TbShopUnitService;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
+import cn.ysk.cashier.service.shop.TbShopUnitService;
+import cn.ysk.cashier.dto.shop.TbShopUnitQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/rest/TbShopUserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/rest/TbShopUserController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
index aed4e840..25b5b6d5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/rest/TbShopUserController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.rest;
+package cn.ysk.cashier.controller.shop;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.shopInfo.shopUser.domain.TbShopUser;
-import me.zhengjie.modules.shopInfo.shopUser.service.TbShopUserService;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
+import cn.ysk.cashier.service.shop.TbShopUserService;
+import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java
index 00287e34..b555cae6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java
index 4df62f98..d789fd09 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotButtonConfigQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotButtonConfigQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java
index 3a6613b2..1426d65d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java
index 6a781333..ce14acb3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/dto/BotConfigQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotConfigQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java
index 34ff8c9f..93ee777f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.sql.Timestamp;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java
index 471c62b9..cc5a0e83 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.sql.Timestamp;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java
index 04031e7c..d629ccf6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/dto/BotUserFlowQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserFlowQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java
index 2209c1fe..e174c66c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/dto/BotUserQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/BotUserQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogDto.java
index f9f5383f..a553b98b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogQueryCriteria.java
index b7e12dbd..8bd0be42 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/dto/TbRenewalsPayLogQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbRenewalsPayLogQueryCriteria.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeDto.java
index c005f619..a3838b3d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeQueryCriteria.java
index 11991528..d2900e83 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/dto/TbShopPayTypeQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopPayTypeQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoDto.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoDto.java
index ce4c2356..2eb18126 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoQueryCriteria.java
index f1ea9a82..e5e88038 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/dto/TbUserInfoQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbUserInfoQueryCriteria.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.service.dto;
+package cn.ysk.cashier.dto;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java
index ef28bfa6..61572a8b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartQueryCriteria.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartQueryCriteria.java
index 0b300c7e..35a91d30 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/dto/TbCashierCartQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartQueryCriteria.java
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailDto.java
index 7ac1ae4a..896b3aba 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
import java.sql.Timestamp;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailQueryCriteria.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailQueryCriteria.java
index 616f089f..00e97dac 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/dto/TbOrderDetailQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailQueryCriteria.java
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
index bd29e48e..f614d069 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java
index d8f6cdd0..2066bd5e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/dto/TbOrderInfoQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.service.dto;
+package cn.ysk.cashier.dto.order;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/OutAndOnDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/OutAndOnDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/OutAndOnDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/OutAndOnDto.java
index 880511c8..e1b24329 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/OutAndOnDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/OutAndOnDto.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.productInfo.productStockOperate.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import lombok.NonNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/ProductListDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/ProductListDto.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/ProductListDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/ProductListDto.java
index 0b0d2b8a..f42f7dea 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/ProductListDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/ProductListDto.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.productInfo.productStockOperate.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/SpecDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/SpecDto.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/SpecDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/SpecDto.java
index a129ad7a..93c00e7f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/SpecDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/SpecDto.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.productInfo.productSpec.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java
index 5780a116..9a5deaa6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
+import cn.ysk.cashier.pojo.product.TbProductSku;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java
index ca86b326..a88ce6b8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupQueryCriteria.java
index 9e4861a2..867e8a5d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/dto/TbProductGroupQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryCriteria.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryCriteria.java
index 288b6e09..c3b9dd5b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/dto/TbProductQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryCriteria.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuDto.java
index 288bd2a5..b2f0c612 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuQueryCriteria.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuQueryCriteria.java
index 2f1e326f..b1d31c58 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/dto/TbProductSkuQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuQueryCriteria.java
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultDto.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultDto.java
index 5ffec2a1..3ddc660c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultQueryCriteria.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultQueryCriteria.java
index ee0ccaf8..44ecc072 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/dto/TbProductSkuResultQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuResultQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecDto.java
index e5e52728..a7dd06a2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecQueryCriteria.java
index bd69a1f0..9f793adf 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/dto/TbProductSpecQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSpecQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailDto.java
index b822f0da..1ff28fc3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailQueryCriteria.java
index 61e6096b..f18fd265 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/dto/TbProductStockDetailQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailQueryCriteria.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateDto.java
index 461a9663..2e7b68d2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateQueryCriteria.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateQueryCriteria.java
index 25cf3a03..3630b8da 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/dto/TbProductStockOperateQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockOperateQueryCriteria.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryDto.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryDto.java
index ff326348..282ae5cf 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryDto.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.service.dto;
+package cn.ysk.cashier.dto.product;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Data;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryQueryCriteria.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryQueryCriteria.java
index c73a36fc..588e4742 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/dto/TbShopCategoryQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.service.dto;
+package cn.ysk.cashier.dto.product;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintConfig.java
similarity index 67%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintConfig.java
index 11333db4..38c01d54 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintConfig.java
@@ -1,7 +1,7 @@
-package me.zhengjie.modules.shopInfo.shopPrint.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintMachineDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintMachineDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintMachineDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintMachineDto.java
index 21549462..8ef71e91 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/PrintMachineDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/PrintMachineDto.java
@@ -1,4 +1,4 @@
-package me.zhengjie.modules.shopInfo.shopPrint.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountDto.java
index 201cdd39..2501cfd5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountQueryCriteria.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountQueryCriteria.java
index 64889c31..a9e192d2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/dto/TbMerchantAccountQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantAccountQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterDto.java
index fdd797d4..535d4b2e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterQueryCriteria.java
index 62223ab7..ea96d18b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/dto/TbMerchantRegisterQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantRegisterQueryCriteria.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
index 8f5fe5fc..7f6d5ba5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyQueryCriteria.java
index a38ed61f..868fbf5e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/dto/TbMerchantThirdApplyQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java
index 037901e3..0e9ddaad 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.service.dto;
+package cn.ysk.cashier.dto.shop;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java
index a0f4fb3a..801e4726 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/dto/TbPlussShopStaffQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPlussShopStaffQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java
index aff05cf5..79880cf2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineQueryCriteria.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineQueryCriteria.java
index 4792fac5..8f84e5aa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/dto/TbPrintMachineQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbPrintMachineQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesDto.java
index ec4d1017..328db5e1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesQueryCriteria.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesQueryCriteria.java
index 49e8a39d..37a7088e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/dto/TbReceiptSalesQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbReceiptSalesQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaDto.java
index db0abe1c..ca9415e2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaQueryCriteria.java
index 5ffcaf39..efe71daa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/dto/TbShopAreaQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopAreaQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadDto.java
index 4ff524df..1f21324f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadQueryCriteria.java
index 699fbe42..1996d037 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/dto/TbShopCashSpreadQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCashSpreadQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyDto.java
index dd097c5b..9537dde4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyQueryCriteria.java
index 1ccfc901..016f805c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/dto/TbShopCurrencyQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopCurrencyQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
index 28b54681..c5b55a09 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.service.dto;
+package cn.ysk.cashier.dto.shop;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
index efafb0ae..1f5003a7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/dto/TbShopInfoQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorDto.java
index 5baa6246..63b7c7e7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorQueryCriteria.java
index 7e50175a..7cc989e2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/dto/TbShopPurveyorQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorQueryCriteria.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactDto.java
index 0ac5a59b..e50551f8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactQueryCriteria.java
index 97a66ff6..fdfae8bd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/dto/TbShopPurveyorTransactQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactQueryCriteria.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableDto.java
index eb914f41..22f74978 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
index 6caea1ba..ce7a0f45 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitDto.java
index 2970e3df..c8f6fa99 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitQueryCriteria.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitQueryCriteria.java
index 44698d46..87e82e14 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/dto/TbShopUnitQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUnitQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java
index d262ba29..0f6ca19d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserQueryCriteria.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserQueryCriteria.java
index 5acdd420..baef7e17 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/dto/TbShopUserQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopUserQueryCriteria.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.service.dto;
+package cn.ysk.cashier.dto.shop;
import lombok.Data;
-import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/PayTypeEnum.java b/eladmin-system/src/main/java/cn/ysk/cashier/enums/PayTypeEnum.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/PayTypeEnum.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/enums/PayTypeEnum.java
index 285839f6..21350c80 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/PayTypeEnum.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/enums/PayTypeEnum.java
@@ -1,6 +1,5 @@
-package me.zhengjie.modules.payType.domain;
+package cn.ysk.cashier.enums;
-import com.alipay.service.schema.util.StringUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotButtonConfigMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotButtonConfigMapper.java
similarity index 81%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotButtonConfigMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotButtonConfigMapper.java
index 81d83e58..73775b83 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotButtonConfigMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotButtonConfigMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.bot.domain.BotButtonConfig;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.BotButtonConfig;
+import cn.ysk.cashier.dto.BotButtonConfigDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotConfigMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotConfigMapper.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotConfigMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotConfigMapper.java
index eef5b860..c7ec730b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/mapstruct/BotConfigMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotConfigMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.bot.domain.BotConfig;
-import me.zhengjie.modules.bot.service.dto.BotConfigDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.BotConfig;
+import cn.ysk.cashier.dto.BotConfigDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/mapstruct/BotUserFlowMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserFlowMapper.java
similarity index 81%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/service/mapstruct/BotUserFlowMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserFlowMapper.java
index 9cedfd3b..bd547896 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/mapstruct/BotUserFlowMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserFlowMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.account.domain.BotUserFlow;
-import me.zhengjie.modules.account.service.dto.BotUserFlowDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.BotUserFlow;
+import cn.ysk.cashier.dto.BotUserFlowDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/mapstruct/BotUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserMapper.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/service/mapstruct/BotUserMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserMapper.java
index 0e4ddbd1..40cbe449 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/mapstruct/BotUserMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/BotUserMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.user.domain.BotUser;
-import me.zhengjie.modules.user.service.dto.BotUserDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.BotUser;
+import cn.ysk.cashier.dto.BotUserDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/mapstruct/TbRenewalsPayLogMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbRenewalsPayLogMapper.java
similarity index 80%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/mapstruct/TbRenewalsPayLogMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbRenewalsPayLogMapper.java
index ef30d0c5..63945c57 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/mapstruct/TbRenewalsPayLogMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbRenewalsPayLogMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.renewals.domain.TbRenewalsPayLog;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.TbRenewalsPayLog;
+import cn.ysk.cashier.dto.TbRenewalsPayLogDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/mapstruct/TbShopPayTypeMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbShopPayTypeMapper.java
similarity index 80%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/service/mapstruct/TbShopPayTypeMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbShopPayTypeMapper.java
index 2b793b5c..913cbb53 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/mapstruct/TbShopPayTypeMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbShopPayTypeMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.payType.domain.TbShopPayType;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.TbShopPayType;
+import cn.ysk.cashier.dto.TbShopPayTypeDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/mapstruct/TbUserInfoMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbUserInfoMapper.java
similarity index 80%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/mapstruct/TbUserInfoMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbUserInfoMapper.java
index cc62be98..9e35e6f0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/mapstruct/TbUserInfoMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/TbUserInfoMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.service.mapstruct;
+package cn.ysk.cashier.mapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.TbUserInfo;
+import cn.ysk.cashier.dto.TbUserInfoDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/mapstruct/TbCashierCartMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbCashierCartMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/mapstruct/TbCashierCartMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbCashierCartMapper.java
index d707e881..4705d75c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/mapstruct/TbCashierCartMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbCashierCartMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.service.mapstruct;
+package cn.ysk.cashier.mapper.order;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.dto.order.TbCashierCartDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/mapstruct/TbOrderDetailMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderDetailMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/mapstruct/TbOrderDetailMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderDetailMapper.java
index 9ee08b85..8406100c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/mapstruct/TbOrderDetailMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderDetailMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.service.mapstruct;
+package cn.ysk.cashier.mapper.order;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.order.orderDetail.domain.TbOrderDetail;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.order.TbOrderDetail;
+import cn.ysk.cashier.dto.order.TbOrderDetailDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/mapstruct/TbOrderInfoMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderInfoMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/mapstruct/TbOrderInfoMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderInfoMapper.java
index a7d3a451..9d30564a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/mapstruct/TbOrderInfoMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/order/TbOrderInfoMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.service.mapstruct;
+package cn.ysk.cashier.mapper.order;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.order.orderInfo.domain.TbOrderInfo;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.order.TbOrderInfo;
+import cn.ysk.cashier.dto.order.TbOrderInfoDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/mapstruct/TbProductGroupMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductGroupMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/mapstruct/TbProductGroupMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductGroupMapper.java
index 9b0c2377..7885eebd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/mapstruct/TbProductGroupMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductGroupMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productGroup.domain.TbProductGroup;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductGroup;
+import cn.ysk.cashier.dto.product.TbProductGroupDto;
import org.mapstruct.Mapper;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/mapstruct/TbProductMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/mapstruct/TbProductMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java
index 87e7c109..be839f5a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/mapstruct/TbProductMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProduct;
+import cn.ysk.cashier.dto.product.TbProductDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/mapstruct/TbProductSkuMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSkuMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/mapstruct/TbProductSkuMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSkuMapper.java
index f28a4f70..7a9735a9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/mapstruct/TbProductSkuMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSkuMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.dto.product.TbProductSkuDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/mapstruct/TbProductSpecMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSpecMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/mapstruct/TbProductSpecMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSpecMapper.java
index 37e2408d..91f05278 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/mapstruct/TbProductSpecMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductSpecMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
+import cn.ysk.cashier.dto.product.TbProductSpecDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/mapstruct/TbProductStockDetailMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockDetailMapper.java
similarity index 76%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/mapstruct/TbProductStockDetailMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockDetailMapper.java
index d205ad09..1192666d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/mapstruct/TbProductStockDetailMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockDetailMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
+import cn.ysk.cashier.dto.product.TbProductStockDetailDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/mapstruct/TbProductStockOperateMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockOperateMapper.java
similarity index 75%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/mapstruct/TbProductStockOperateMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockOperateMapper.java
index e48568f7..82d65573 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/mapstruct/TbProductStockOperateMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbProductStockOperateMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productStockOperate.domain.TbProductStockOperate;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductStockOperate;
+import cn.ysk.cashier.dto.product.TbProductStockOperateDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/mapstruct/TbShopCategoryMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbShopCategoryMapper.java
similarity index 76%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/mapstruct/TbShopCategoryMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbShopCategoryMapper.java
index e2cae55d..21087f5d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/mapstruct/TbShopCategoryMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/product/TbShopCategoryMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.service.mapstruct;
+package cn.ysk.cashier.mapper.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
+import cn.ysk.cashier.dto.product.TbShopCategoryDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/mapstruct/TbMerchantAccountMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantAccountMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/mapstruct/TbMerchantAccountMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantAccountMapper.java
index 1c9a3b1a..d2953e07 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/mapstruct/TbMerchantAccountMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantAccountMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/mapstruct/TbMerchantRegisterMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantRegisterMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/mapstruct/TbMerchantRegisterMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantRegisterMapper.java
index 67d6ab3c..e81ccfdf 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/mapstruct/TbMerchantRegisterMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantRegisterMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/mapstruct/TbMerchantThirdApplyMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantThirdApplyMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/mapstruct/TbMerchantThirdApplyMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantThirdApplyMapper.java
index 2d7780d3..efbfb3db 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/mapstruct/TbMerchantThirdApplyMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbMerchantThirdApplyMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopThirdApply.domain.TbMerchantThirdApply;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/mapstruct/TbPlussShopStaffMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPlussShopStaffMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/mapstruct/TbPlussShopStaffMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPlussShopStaffMapper.java
index 054b0e79..2b976e56 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/mapstruct/TbPlussShopStaffMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPlussShopStaffMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/mapstruct/TbPrintMachineMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/mapstruct/TbPrintMachineMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java
index 4a46fe35..d2d8b14f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/mapstruct/TbPrintMachineMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbPrintMachineMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopPrint.domain.TbPrintMachine;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.controller.shop.TbPrintMachine;
+import cn.ysk.cashier.dto.shop.TbPrintMachineDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/mapstruct/TbReceiptSalesMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbReceiptSalesMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/mapstruct/TbReceiptSalesMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbReceiptSalesMapper.java
index c682e634..febd2c34 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/mapstruct/TbReceiptSalesMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbReceiptSalesMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.domain.TbReceiptSales;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbReceiptSales;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/mapstruct/TbShopAreaMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopAreaMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/mapstruct/TbShopAreaMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopAreaMapper.java
index 62b93cd0..9847e872 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/mapstruct/TbShopAreaMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopAreaMapper.java
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
+
+import cn.ysk.cashier.dto.shop.TbShopAreaDto;
+import cn.ysk.cashier.pojo.shop.TbShopArea;
+import cn.ysk.cashier.base.BaseMapper;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopArea.domain.TbShopArea;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/mapstruct/TbShopCashSpreadMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCashSpreadMapper.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/mapstruct/TbShopCashSpreadMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCashSpreadMapper.java
index d24db0f7..aabf892a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/mapstruct/TbShopCashSpreadMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCashSpreadMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopSpread.domain.TbShopCashSpread;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopCashSpread;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/mapstruct/TbShopCurrencyMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCurrencyMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/mapstruct/TbShopCurrencyMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCurrencyMapper.java
index 78dfc297..6ad1878c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/mapstruct/TbShopCurrencyMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopCurrencyMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopCurrency.domain.TbShopCurrency;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopCurrency;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/mapstruct/TbShopInfoMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopInfoMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/mapstruct/TbShopInfoMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopInfoMapper.java
index ffb97501..0749836d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/mapstruct/TbShopInfoMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopInfoMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.dto.shop.TbShopInfoDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/mapstruct/TbShopPurveyorMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorMapper.java
similarity index 77%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/mapstruct/TbShopPurveyorMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorMapper.java
index 736e5ca9..e51f9aca 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/mapstruct/TbShopPurveyorMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/mapstruct/TbShopPurveyorTransactMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorTransactMapper.java
similarity index 75%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/mapstruct/TbShopPurveyorTransactMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorTransactMapper.java
index 9eae0c40..14788b81 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/mapstruct/TbShopPurveyorTransactMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopPurveyorTransactMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/mapstruct/TbShopTableMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopTableMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/mapstruct/TbShopTableMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopTableMapper.java
index 941b64b7..698248ae 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/mapstruct/TbShopTableMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopTableMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.table.domain.TbShopTable;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
+import cn.ysk.cashier.dto.shop.TbShopTableDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/mapstruct/TbShopUnitMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUnitMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/mapstruct/TbShopUnitMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUnitMapper.java
index c62a1668..9283fb21 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/mapstruct/TbShopUnitMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUnitMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
+import cn.ysk.cashier.dto.shop.TbShopUnitDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/mapstruct/TbShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUserMapper.java
similarity index 79%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/mapstruct/TbShopUserMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUserMapper.java
index b3151722..d2178248 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/mapstruct/TbShopUserMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mapper/shop/TbShopUserMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.service.mapstruct;
+package cn.ysk.cashier.mapper.shop;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.shopInfo.shopUser.domain.TbShopUser;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
+import cn.ysk.cashier.dto.shop.TbShopUserDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/App.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/App.java
index cf5789c9..9929b177 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/App.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.domain;
+package cn.ysk.cashier.mnt.domain;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Database.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Database.java
index 6b3a68a6..b2411e60 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Database.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.domain;
+package cn.ysk.cashier.mnt.domain;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java
index bcf61e54..ce18ba64 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.domain;
+package cn.ysk.cashier.mnt.domain;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Set;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/DeployHistory.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/DeployHistory.java
index 6e07e136..5c23218e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/DeployHistory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.domain;
+package cn.ysk.cashier.mnt.domain;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/ServerDeploy.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/ServerDeploy.java
index f5235627..ba5983b0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/ServerDeploy.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.domain;
+package cn.ysk.cashier.mnt.domain;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Objects;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/AppRepository.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/AppRepository.java
index 41e5f5c9..0e566b96 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/AppRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.repository;
+package cn.ysk.cashier.mnt.repository;
-import me.zhengjie.modules.mnt.domain.App;
+import cn.ysk.cashier.mnt.domain.App;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DatabaseRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DatabaseRepository.java
index 695e0adc..5d802ad4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DatabaseRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.repository;
+package cn.ysk.cashier.mnt.repository;
-import me.zhengjie.modules.mnt.domain.Database;
+import cn.ysk.cashier.mnt.domain.Database;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployHistoryRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployHistoryRepository.java
index 3c8980ec..9119f646 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployHistoryRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.repository;
+package cn.ysk.cashier.mnt.repository;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployRepository.java
index 2ea44986..f7187f81 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/DeployRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.repository;
+package cn.ysk.cashier.mnt.repository;
-import me.zhengjie.modules.mnt.domain.Deploy;
+import cn.ysk.cashier.mnt.domain.Deploy;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/ServerDeployRepository.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/ServerDeployRepository.java
index 4ca336c0..41f0ac45 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/repository/ServerDeployRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.repository;
+package cn.ysk.cashier.mnt.repository;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java
index 61ce07c1..8b187a2f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/AppController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.rest;
+package cn.ysk.cashier.mnt.rest;
+import cn.ysk.cashier.mnt.domain.App;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.mnt.service.AppService;
+import cn.ysk.cashier.mnt.service.dto.AppQueryCriteria;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java
index 215c802a..151d755e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DatabaseController.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.rest;
+package cn.ysk.cashier.mnt.rest;
+import cn.ysk.cashier.mnt.util.SqlUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.util.SqlUtils;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.mnt.domain.Database;
+import cn.ysk.cashier.mnt.service.DatabaseService;
+import cn.ysk.cashier.mnt.service.dto.DatabaseDto;
+import cn.ysk.cashier.mnt.service.dto.DatabaseQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java
index 38197e82..9cfd48ba 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployController.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.rest;
+package cn.ysk.cashier.mnt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.mnt.domain.Deploy;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.service.DeployService;
+import cn.ysk.cashier.mnt.service.dto.DeployQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java
index 2d1037ba..a9ce5c5d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/DeployHistoryController.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.rest;
+package cn.ysk.cashier.mnt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.mnt.service.DeployHistoryService;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryQueryCriteria;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java
index 894a90a9..11a1fccd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/rest/ServerDeployController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.rest;
+package cn.ysk.cashier.mnt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.mnt.service.ServerDeployService;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployQueryCriteria;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/AppService.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/AppService.java
index c8227785..637ff3cc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/AppService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service;
+package cn.ysk.cashier.mnt.service;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import cn.ysk.cashier.mnt.domain.App;
+import cn.ysk.cashier.mnt.service.dto.AppDto;
+import cn.ysk.cashier.mnt.service.dto.AppQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DatabaseService.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DatabaseService.java
index e8a3acb7..519d9d08 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DatabaseService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service;
+package cn.ysk.cashier.mnt.service;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
+import cn.ysk.cashier.mnt.domain.Database;
+import cn.ysk.cashier.mnt.service.dto.DatabaseDto;
+import cn.ysk.cashier.mnt.service.dto.DatabaseQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployHistoryService.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployHistoryService.java
index 5eb1b3de..1b0d8467 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployHistoryService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service;
+package cn.ysk.cashier.mnt.service;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryDto;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployService.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployService.java
index 583474d7..f5b51a2f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/DeployService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service;
+package cn.ysk.cashier.mnt.service;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
+import cn.ysk.cashier.mnt.domain.Deploy;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.service.dto.DeployDto;
+import cn.ysk.cashier.mnt.service.dto.DeployQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/ServerDeployService.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/ServerDeployService.java
index be8bb573..4937151a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/ServerDeployService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service;
+package cn.ysk.cashier.mnt.service;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployDto;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppDto.java
index c6fd6f74..c276aac1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppDto.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import cn.ysk.cashier.base.BaseDTO;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppQueryCriteria.java
index 17f358f7..3f1afd4b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/AppQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseDto.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseDto.java
index 689b06b9..1424a2f9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseDto.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import cn.ysk.cashier.base.BaseDTO;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseQueryCriteria.java
index 53d619d4..a11a4dfa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DatabaseQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployDto.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployDto.java
index f3d77b8e..3f8b1d8c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployDto.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import cn.hutool.core.collection.CollectionUtil;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import cn.ysk.cashier.base.BaseDTO;
import java.io.Serializable;
import java.util.Objects;
import java.util.Set;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryDto.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryDto.java
index a9f480cf..366b3add 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryDto.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryQueryCriteria.java
index c34f1242..b540238a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployHistoryQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployQueryCriteria.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployQueryCriteria.java
index c404620a..bbc2e6ca 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/DeployQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployDto.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployDto.java
index a49c7950..e804da4b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployDto.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import cn.ysk.cashier.base.BaseDTO;
import java.io.Serializable;
import java.util.Objects;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployQueryCriteria.java
index bb8bd412..d9539fc1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/dto/ServerDeployQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.dto;
+package cn.ysk.cashier.mnt.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/AppServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/AppServiceImpl.java
index 42b088ff..aec37261 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/AppServiceImpl.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.impl;
+package cn.ysk.cashier.mnt.service.impl;
+import cn.ysk.cashier.mnt.domain.App;
+import cn.ysk.cashier.mnt.repository.AppRepository;
+import cn.ysk.cashier.mnt.service.AppService;
+import cn.ysk.cashier.mnt.service.dto.AppQueryCriteria;
+import cn.ysk.cashier.mnt.service.mapstruct.AppMapper;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.repository.AppRepository;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.AppMapper;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import me.zhengjie.utils.ValidationUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.mnt.service.dto.AppDto;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DatabaseServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DatabaseServiceImpl.java
index c7740285..f41bc5c3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DatabaseServiceImpl.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.impl;
+package cn.ysk.cashier.mnt.service.impl;
import cn.hutool.core.util.IdUtil;
+import cn.ysk.cashier.mnt.domain.Database;
+import cn.ysk.cashier.mnt.repository.DatabaseRepository;
+import cn.ysk.cashier.mnt.service.DatabaseService;
+import cn.ysk.cashier.mnt.service.mapstruct.DatabaseMapper;
+import cn.ysk.cashier.mnt.util.SqlUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.repository.DatabaseRepository;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper;
-import me.zhengjie.modules.mnt.util.SqlUtils;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import me.zhengjie.utils.ValidationUtil;
+import cn.ysk.cashier.mnt.service.dto.DatabaseDto;
+import cn.ysk.cashier.mnt.service.dto.DatabaseQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployHistoryServiceImpl.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployHistoryServiceImpl.java
index 7431113d..de3a505c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployHistoryServiceImpl.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.impl;
+package cn.ysk.cashier.mnt.service.impl;
import cn.hutool.core.util.IdUtil;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.repository.DeployHistoryRepository;
+import cn.ysk.cashier.mnt.service.mapstruct.DeployHistoryMapper;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.repository.DeployHistoryRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import me.zhengjie.utils.ValidationUtil;
+import cn.ysk.cashier.mnt.service.DeployHistoryService;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryDto;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployServiceImpl.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployServiceImpl.java
index f2491cda..c539a0f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/DeployServiceImpl.java
@@ -13,32 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.impl;
+package cn.ysk.cashier.mnt.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
+import cn.ysk.cashier.mnt.domain.App;
+import cn.ysk.cashier.mnt.domain.Deploy;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.mnt.repository.DeployRepository;
+import cn.ysk.cashier.mnt.service.DeployHistoryService;
+import cn.ysk.cashier.mnt.service.DeployService;
+import cn.ysk.cashier.mnt.service.ServerDeployService;
+import cn.ysk.cashier.mnt.service.dto.DeployDto;
+import cn.ysk.cashier.mnt.service.dto.DeployQueryCriteria;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployDto;
+import cn.ysk.cashier.mnt.service.mapstruct.DeployMapper;
+import cn.ysk.cashier.mnt.util.ExecuteShellUtil;
+import cn.ysk.cashier.mnt.util.ScpClientUtil;
+import cn.ysk.cashier.mnt.websocket.WebSocketServer;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.DeployRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
-import me.zhengjie.modules.mnt.util.ScpClientUtil;
-import me.zhengjie.modules.mnt.websocket.MsgType;
-import me.zhengjie.modules.mnt.websocket.SocketMsg;
-import me.zhengjie.modules.mnt.websocket.WebSocketServer;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.mnt.service.dto.AppDto;
+import cn.ysk.cashier.mnt.websocket.MsgType;
+import cn.ysk.cashier.mnt.websocket.SocketMsg;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/ServerDeployServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/ServerDeployServiceImpl.java
index 63272dae..29f88c39 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/impl/ServerDeployServiceImpl.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.impl;
+package cn.ysk.cashier.mnt.service.impl;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.mnt.repository.ServerDeployRepository;
+import cn.ysk.cashier.mnt.service.ServerDeployService;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployDto;
+import cn.ysk.cashier.mnt.service.mapstruct.ServerDeployMapper;
+import cn.ysk.cashier.mnt.util.ExecuteShellUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.ServerDeployRepository;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.ServerDeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import me.zhengjie.utils.ValidationUtil;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/AppMapper.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/AppMapper.java
index fc39eeb2..2e728a9e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/AppMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.mapstruct;
+package cn.ysk.cashier.mnt.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
+import cn.ysk.cashier.mnt.domain.App;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.mnt.service.dto.AppDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DatabaseMapper.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DatabaseMapper.java
index 3cc6e8dd..f6573038 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DatabaseMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.mapstruct;
+package cn.ysk.cashier.mnt.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
+import cn.ysk.cashier.mnt.domain.Database;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.mnt.service.dto.DatabaseDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployHistoryMapper.java
similarity index 81%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployHistoryMapper.java
index 2522ab02..17b8214c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployHistoryMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.mapstruct;
+package cn.ysk.cashier.mnt.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
+import cn.ysk.cashier.mnt.domain.DeployHistory;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.mnt.service.dto.DeployHistoryDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployMapper.java
similarity index 83%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployMapper.java
index cd3edee8..56b4c263 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/DeployMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.mapstruct;
+package cn.ysk.cashier.mnt.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
+import cn.ysk.cashier.mnt.domain.Deploy;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.mnt.service.dto.DeployDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/ServerDeployMapper.java
similarity index 81%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/ServerDeployMapper.java
index 960b25b1..423ff08e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/service/mapstruct/ServerDeployMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.service.mapstruct;
+package cn.ysk.cashier.mnt.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
+import cn.ysk.cashier.mnt.domain.ServerDeploy;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.mnt.service.dto.ServerDeployDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/DataTypeEnum.java
similarity index 99%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/DataTypeEnum.java
index e104b9ee..91e91db0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/DataTypeEnum.java
@@ -17,7 +17,7 @@
*
*/
-package me.zhengjie.modules.mnt.util;
+package cn.ysk.cashier.mnt.util;
import lombok.extern.slf4j.Slf4j;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ExecuteShellUtil.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ExecuteShellUtil.java
index a5d5b599..7579ad92 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ExecuteShellUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.util;
+package cn.ysk.cashier.mnt.util;
import cn.hutool.core.io.IoUtil;
import com.jcraft.jsch.ChannelShell;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ScpClientUtil.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ScpClientUtil.java
index 7cb83aa1..8babc5fc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/ScpClientUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.util;
+package cn.ysk.cashier.mnt.util;
import ch.ethz.ssh2.Connection;
import ch.ethz.ssh2.SCPClient;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java
index d7e06b17..b59bec08 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java
@@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.util;
+package cn.ysk.cashier.mnt.util;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.StringUtils;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.utils.CloseUtil;
+import cn.ysk.cashier.utils.CloseUtil;
+import cn.ysk.cashier.mnt.util.DataTypeEnum;
import javax.sql.DataSource;
import java.io.BufferedReader;
import java.io.File;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/MsgType.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/MsgType.java
index 2fc473da..4134b3f4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/MsgType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.websocket;
+package cn.ysk.cashier.mnt.websocket;
/**
* @author ZhangHouYing
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/SocketMsg.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/SocketMsg.java
index ade33a24..a2602708 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/SocketMsg.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.websocket;
+package cn.ysk.cashier.mnt.websocket;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/WebSocketServer.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/WebSocketServer.java
index 9c92165b..0b5dc892 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/websocket/WebSocketServer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.mnt.websocket;
+package cn.ysk.cashier.mnt.websocket;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotButtonConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotButtonConfig.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotButtonConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotButtonConfig.java
index 8be15e19..80314174 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotButtonConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotButtonConfig.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotConfig.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotConfig.java
index 988c34e3..c1cebb1b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/domain/BotConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotConfig.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/domain/BotUser.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUser.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/domain/BotUser.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUser.java
index 520f56ab..0b6b799d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/domain/BotUser.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUser.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.sql.Timestamp;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/domain/BotUserFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUserFlow.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/domain/BotUserFlow.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUserFlow.java
index b6c650ce..729eb26b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/domain/BotUserFlow.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/BotUserFlow.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/domain/TbRenewalsPayLog.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbRenewalsPayLog.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/domain/TbRenewalsPayLog.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbRenewalsPayLog.java
index 02d94e30..14823320 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/domain/TbRenewalsPayLog.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbRenewalsPayLog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/TbShopPayType.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbShopPayType.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/TbShopPayType.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbShopPayType.java
index 0b28ceed..f6c44bb7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/domain/TbShopPayType.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbShopPayType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/domain/TbUserInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbUserInfo.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/domain/TbUserInfo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbUserInfo.java
index 24394382..0cf4340f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/domain/TbUserInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbUserInfo.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.domain;
+package cn.ysk.cashier.pojo;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/domain/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/domain/TbCashierCart.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
index 88ce860c..db009687 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/domain/TbCashierCart.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.domain;
+package cn.ysk.cashier.pojo.order;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/domain/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/domain/TbOrderDetail.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
index 10d32761..1e70f970 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/domain/TbOrderDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.domain;
+package cn.ysk.cashier.pojo.order;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/domain/TbOrderInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/domain/TbOrderInfo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
index 61d58513..9cec3f92 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/domain/TbOrderInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.domain;
+package cn.ysk.cashier.pojo.order;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProduct.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
index 59794157..cdbe7561 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/domain/TbProduct.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
@@ -13,14 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
-import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.DynamicInsert;
import javax.persistence.*;
import javax.validation.constraints.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/domain/TbProductGroup.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/domain/TbProductGroup.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java
index 4bd7b9a0..3b21ef88 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/domain/TbProductGroup.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/domain/TbProductSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/domain/TbProductSku.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
index c41b82a9..e78e1fc4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/domain/TbProductSku.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
@@ -13,10 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.domain;
+package cn.ysk.cashier.pojo.product;
-import cn.hutool.json.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/domain/TbProductSkuResult.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSkuResult.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/domain/TbProductSkuResult.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSkuResult.java
index d5dab17b..bdf4f066 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/domain/TbProductSkuResult.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSkuResult.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/domain/TbProductSpec.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSpec.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/domain/TbProductSpec.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSpec.java
index 970052ed..0f8ed33f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/domain/TbProductSpec.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSpec.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockDetail.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockDetail.java
index 3f316db2..79605465 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/domain/TbProductStockDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockDetail.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/domain/TbProductStockOperate.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockOperate.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/domain/TbProductStockOperate.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockOperate.java
index a4410379..1785564e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/domain/TbProductStockOperate.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductStockOperate.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/domain/TbShopCategory.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbShopCategory.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/domain/TbShopCategory.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbShopCategory.java
index 2b931d42..abfd30a3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/domain/TbShopCategory.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbShopCategory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.domain;
+package cn.ysk.cashier.pojo.product;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/domain/TbMerchantAccount.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantAccount.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/domain/TbMerchantAccount.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantAccount.java
index 450ff3fd..55556084 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/domain/TbMerchantAccount.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantAccount.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/domain/TbMerchantRegister.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantRegister.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/domain/TbMerchantRegister.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantRegister.java
index 7f3290c8..b916fc24 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/domain/TbMerchantRegister.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantRegister.java
@@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.domain;
+package cn.ysk.cashier.pojo.shop;
-import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/domain/TbMerchantThirdApply.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/domain/TbMerchantThirdApply.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java
index b808e5fc..359456c5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/domain/TbMerchantThirdApply.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.io.Serializable;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/domain/TbPlussShopStaff.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/domain/TbPlussShopStaff.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java
index cb8f92cd..618b8411 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/domain/TbPlussShopStaff.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/domain/TbReceiptSales.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbReceiptSales.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/domain/TbReceiptSales.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbReceiptSales.java
index ebccecfb..9469bda7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/domain/TbReceiptSales.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbReceiptSales.java
@@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.domain;
+package cn.ysk.cashier.pojo.shop;
-import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/domain/TbShopArea.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopArea.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/domain/TbShopArea.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopArea.java
index 976705d4..622ec7c0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/domain/TbShopArea.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopArea.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/domain/TbShopCashSpread.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCashSpread.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/domain/TbShopCashSpread.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCashSpread.java
index 7d072a60..0dac0c58 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/domain/TbShopCashSpread.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCashSpread.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/domain/TbShopCurrency.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCurrency.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/domain/TbShopCurrency.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCurrency.java
index d0105a30..35e9a5a1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/domain/TbShopCurrency.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopCurrency.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/domain/TbShopInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
similarity index 99%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/domain/TbShopInfo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
index 0f5047e0..be88f982 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/domain/TbShopInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/domain/TbShopPurveyor.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyor.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/domain/TbShopPurveyor.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyor.java
index 035d4b3b..122c025f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/domain/TbShopPurveyor.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/domain/TbShopPurveyorTransact.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyorTransact.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/domain/TbShopPurveyorTransact.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyorTransact.java
index f12edb60..408c59be 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/domain/TbShopPurveyorTransact.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopPurveyorTransact.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java
index 4f3c9056..6edb698b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/domain/TbShopUnit.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUnit.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/domain/TbShopUnit.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUnit.java
index 55ec5eb0..16203657 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/domain/TbShopUnit.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUnit.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/domain/TbShopUser.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java
similarity index 98%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/domain/TbShopUser.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java
index 0dfe8fbe..eef71cb2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/domain/TbShopUser.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.domain;
+package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/JobRunner.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/JobRunner.java
index a5a9c91f..1d0a4dae 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/JobRunner.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.config;
+package cn.ysk.cashier.quartz.config;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
-import me.zhengjie.modules.quartz.repository.QuartzJobRepository;
-import me.zhengjie.modules.quartz.utils.QuartzManage;
+import cn.ysk.cashier.quartz.repository.QuartzJobRepository;
+import cn.ysk.cashier.quartz.utils.QuartzManage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.ApplicationArguments;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/QuartzConfig.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/QuartzConfig.java
index 99f2e50e..b343106e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/config/QuartzConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.config;
+package cn.ysk.cashier.quartz.config;
import org.quartz.spi.TriggerFiredBundle;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzJob.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzJob.java
index 39e11f42..5a9ff608 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzJob.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.domain;
+package cn.ysk.cashier.quartz.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzLog.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzLog.java
index 4de57ec1..9c05a934 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/domain/QuartzLog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.domain;
+package cn.ysk.cashier.quartz.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzJobRepository.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzJobRepository.java
index 79b222be..ea83832b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzJobRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.repository;
+package cn.ysk.cashier.quartz.repository;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzLogRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzLogRepository.java
index db724aa4..39992b94 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/repository/QuartzLogRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.repository;
+package cn.ysk.cashier.quartz.repository;
-import me.zhengjie.modules.quartz.domain.QuartzLog;
+import cn.ysk.cashier.quartz.domain.QuartzLog;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/rest/QuartzJobController.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/rest/QuartzJobController.java
index 0ffee652..de3d8d63 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/rest/QuartzJobController.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.rest;
+package cn.ysk.cashier.quartz.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
-import me.zhengjie.modules.quartz.service.QuartzJobService;
-import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria;
-import me.zhengjie.utils.SpringContextHolder;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
+import cn.ysk.cashier.quartz.service.QuartzJobService;
+import cn.ysk.cashier.quartz.service.dto.JobQueryCriteria;
+import cn.ysk.cashier.utils.SpringContextHolder;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/QuartzJobService.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/QuartzJobService.java
index b32850e9..78a358fb 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/QuartzJobService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.service;
+package cn.ysk.cashier.quartz.service;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
-import me.zhengjie.modules.quartz.domain.QuartzLog;
-import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
+import cn.ysk.cashier.quartz.domain.QuartzLog;
+import cn.ysk.cashier.quartz.service.dto.JobQueryCriteria;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/dto/JobQueryCriteria.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/dto/JobQueryCriteria.java
index 6cec0f19..3b473c65 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/dto/JobQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.service.dto;
+package cn.ysk.cashier.quartz.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/impl/QuartzJobServiceImpl.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/impl/QuartzJobServiceImpl.java
index 42ee326f..c9afdea8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/service/impl/QuartzJobServiceImpl.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.service.impl;
+package cn.ysk.cashier.quartz.service.impl;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
+import cn.ysk.cashier.quartz.domain.QuartzLog;
+import cn.ysk.cashier.quartz.repository.QuartzJobRepository;
+import cn.ysk.cashier.quartz.repository.QuartzLogRepository;
+import cn.ysk.cashier.quartz.service.QuartzJobService;
+import cn.ysk.cashier.quartz.utils.QuartzManage;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
-import me.zhengjie.modules.quartz.domain.QuartzLog;
-import me.zhengjie.modules.quartz.repository.QuartzJobRepository;
-import me.zhengjie.modules.quartz.repository.QuartzLogRepository;
-import me.zhengjie.modules.quartz.service.QuartzJobService;
-import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria;
-import me.zhengjie.modules.quartz.utils.QuartzManage;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.quartz.service.dto.JobQueryCriteria;
import org.quartz.CronExpression;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/task/TestTask.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/task/TestTask.java
index 4cf34342..28087944 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/task/TestTask.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.task;
+package cn.ysk.cashier.quartz.task;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/ExecutionJob.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/ExecutionJob.java
index 5d298ced..a3cdc221 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/ExecutionJob.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.utils;
+package cn.ysk.cashier.quartz.utils;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil;
-import me.zhengjie.config.thread.ThreadPoolExecutorUtil;
-import me.zhengjie.domain.vo.EmailVo;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
-import me.zhengjie.modules.quartz.domain.QuartzLog;
-import me.zhengjie.modules.quartz.repository.QuartzLogRepository;
-import me.zhengjie.modules.quartz.service.QuartzJobService;
-import me.zhengjie.service.EmailService;
-import me.zhengjie.utils.RedisUtils;
-import me.zhengjie.utils.SpringContextHolder;
-import me.zhengjie.utils.StringUtils;
-import me.zhengjie.utils.ThrowableUtil;
+import cn.ysk.cashier.config.thread.ThreadPoolExecutorUtil;
+import cn.ysk.cashier.quartz.repository.QuartzLogRepository;
+import cn.ysk.cashier.domain.vo.EmailVo;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
+import cn.ysk.cashier.quartz.domain.QuartzLog;
+import cn.ysk.cashier.quartz.service.QuartzJobService;
+import cn.ysk.cashier.service.EmailService;
+import cn.ysk.cashier.utils.RedisUtils;
+import cn.ysk.cashier.utils.SpringContextHolder;
+import cn.ysk.cashier.utils.StringUtils;
+import cn.ysk.cashier.utils.ThrowableUtil;
import org.quartz.JobExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzManage.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzManage.java
index e0cf1e0a..35a21627 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzManage.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.utils;
+package cn.ysk.cashier.quartz.utils;
+import cn.ysk.cashier.quartz.domain.QuartzJob;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.quartz.domain.QuartzJob;
+import cn.ysk.cashier.exception.BadRequestException;
import org.quartz.*;
import org.quartz.impl.triggers.CronTriggerImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzRunnable.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzRunnable.java
index 31c3a0f8..9a64ea3f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/quartz/utils/QuartzRunnable.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.quartz.utils;
+package cn.ysk.cashier.quartz.utils;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.utils.SpringContextHolder;
+import cn.ysk.cashier.utils.SpringContextHolder;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Method;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotButtonConfigRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotButtonConfigRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotButtonConfigRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/BotButtonConfigRepository.java
index b714c34e..6f95aff4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotButtonConfigRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotButtonConfigRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.bot.domain.BotButtonConfig;
+import cn.ysk.cashier.pojo.BotButtonConfig;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotConfigRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotConfigRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotConfigRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/BotConfigRepository.java
index 1cf34675..ec9eb050 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/repository/BotConfigRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotConfigRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.bot.domain.BotConfig;
+import cn.ysk.cashier.pojo.BotConfig;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/repository/BotUserFlowRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserFlowRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/repository/BotUserFlowRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserFlowRepository.java
index e6143c4b..5e156606 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/repository/BotUserFlowRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserFlowRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.account.domain.BotUserFlow;
+import cn.ysk.cashier.pojo.BotUserFlow;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/repository/BotUserRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/repository/BotUserRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserRepository.java
index 1f1e57ff..170dad0f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/repository/BotUserRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/BotUserRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.user.domain.BotUser;
+import cn.ysk.cashier.pojo.BotUser;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/repository/TbRenewalsPayLogRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbRenewalsPayLogRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/repository/TbRenewalsPayLogRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/TbRenewalsPayLogRepository.java
index 55b99bad..7f85f4da 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/repository/TbRenewalsPayLogRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbRenewalsPayLogRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.renewals.domain.TbRenewalsPayLog;
+import cn.ysk.cashier.pojo.TbRenewalsPayLog;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/repository/TbShopPayTypeRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbShopPayTypeRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/repository/TbShopPayTypeRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/TbShopPayTypeRepository.java
index 0f7056db..68a63973 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/repository/TbShopPayTypeRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbShopPayTypeRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.payType.domain.TbShopPayType;
+import cn.ysk.cashier.pojo.TbShopPayType;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/repository/TbUserInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbUserInfoRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/repository/TbUserInfoRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/TbUserInfoRepository.java
index 27c6f7b7..8c57c7c3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/repository/TbUserInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/TbUserInfoRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
+import cn.ysk.cashier.pojo.TbUserInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/repository/TbCashierCartRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbCashierCartRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/repository/TbCashierCartRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbCashierCartRepository.java
index 8639a8ea..003161a7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/repository/TbCashierCartRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbCashierCartRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.repository;
+package cn.ysk.cashier.repository.order;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/repository/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/repository/TbOrderDetailRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
index 634e7611..c41a032e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/repository/TbOrderDetailRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.repository;
+package cn.ysk.cashier.repository.order;
-import me.zhengjie.modules.order.orderDetail.domain.TbOrderDetail;
+import cn.ysk.cashier.pojo.order.TbOrderDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/repository/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/repository/TbOrderInfoRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
index 248e41e8..1ce44169 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/repository/TbOrderInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.repository;
+package cn.ysk.cashier.repository.order;
-import me.zhengjie.modules.order.orderInfo.domain.TbOrderInfo;
+import cn.ysk.cashier.pojo.order.TbOrderInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/repository/TbProductGroupRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductGroupRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/repository/TbProductGroupRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductGroupRepository.java
index a4ae37e9..ff3d36db 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/repository/TbProductGroupRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductGroupRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productGroup.domain.TbProductGroup;
+import cn.ysk.cashier.pojo.product.TbProductGroup;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/repository/TbProductRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/repository/TbProductRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java
index bb17dcde..bf9875b4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/repository/TbProductRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
+import cn.ysk.cashier.pojo.product.TbProduct;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/repository/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/repository/TbProductSkuRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
index 2f11596e..6536de54 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/repository/TbProductSkuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import org.apache.ibatis.annotations.Insert;
+import cn.ysk.cashier.pojo.product.TbProductSku;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/mapstruct/TbProductSkuResultMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultMapper.java
similarity index 76%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/mapstruct/TbProductSkuResultMapper.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultMapper.java
index ebaf6efd..30ab6f63 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/mapstruct/TbProductSkuResultMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.service.mapstruct;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultDto;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
+import cn.ysk.cashier.dto.product.TbProductSkuResultDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/repository/TbProductSkuResultRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultRepository.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/repository/TbProductSkuResultRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultRepository.java
index 7eee149e..08c736fa 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/repository/TbProductSkuResultRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuResultRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/repository/TbProductSpecRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSpecRepository.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/repository/TbProductSpecRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSpecRepository.java
index 7480b9a7..b801a505 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/repository/TbProductSpecRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSpecRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/repository/TbProductStockDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockDetailRepository.java
similarity index 83%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/repository/TbProductStockDetailRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockDetailRepository.java
index 585effc6..f9ef5274 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/repository/TbProductStockDetailRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockDetailRepository.java
@@ -13,18 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import org.springframework.data.domain.Page;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
-import org.w3c.dom.stylesheets.LinkStyle;
import java.math.BigDecimal;
-import java.util.List;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/repository/TbProductStockOperateRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockOperateRepository.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/repository/TbProductStockOperateRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockOperateRepository.java
index 331df2ba..a6922d85 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/repository/TbProductStockOperateRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductStockOperateRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productStockOperate.domain.TbProductStockOperate;
+import cn.ysk.cashier.pojo.product.TbProductStockOperate;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/repository/TbShopCategoryRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/repository/TbShopCategoryRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
index 39d1cdad..c8c2e8c4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/repository/TbShopCategoryRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.repository;
+package cn.ysk.cashier.repository.product;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Page;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/repository/TbMerchantAccountRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantAccountRepository.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/repository/TbMerchantAccountRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantAccountRepository.java
index 6d6a8714..8d363706 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/repository/TbMerchantAccountRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantAccountRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/repository/TbMerchantRegisterRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantRegisterRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/repository/TbMerchantRegisterRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantRegisterRepository.java
index fabcf34b..af45d032 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/repository/TbMerchantRegisterRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantRegisterRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/repository/TbMerchantThirdApplyRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantThirdApplyRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/repository/TbMerchantThirdApplyRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantThirdApplyRepository.java
index a884796f..88de1143 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/repository/TbMerchantThirdApplyRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbMerchantThirdApplyRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopThirdApply.domain.TbMerchantThirdApply;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/repository/TbPlussShopStaffRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/repository/TbPlussShopStaffRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
index 5946e718..bbe154f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/repository/TbPlussShopStaffRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
+import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/repository/TbPrintMachineRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPrintMachineRepository.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/repository/TbPrintMachineRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPrintMachineRepository.java
index 9e1fc0f1..33249617 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/repository/TbPrintMachineRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPrintMachineRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopPrint.domain.TbPrintMachine;
+import cn.ysk.cashier.controller.shop.TbPrintMachine;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/repository/TbReceiptSalesRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbReceiptSalesRepository.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/repository/TbReceiptSalesRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbReceiptSalesRepository.java
index 280b0025..492f7815 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/repository/TbReceiptSalesRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbReceiptSalesRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.domain.TbReceiptSales;
+import cn.ysk.cashier.pojo.shop.TbReceiptSales;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/repository/TbShopAreaRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopAreaRepository.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/repository/TbShopAreaRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopAreaRepository.java
index dc8eb7b8..4596248a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/repository/TbShopAreaRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopAreaRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopArea.domain.TbShopArea;
+import cn.ysk.cashier.pojo.shop.TbShopArea;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/repository/TbShopCashSpreadRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCashSpreadRepository.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/repository/TbShopCashSpreadRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCashSpreadRepository.java
index 38a14197..e65fccdb 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/repository/TbShopCashSpreadRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCashSpreadRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopSpread.domain.TbShopCashSpread;
+import cn.ysk.cashier.pojo.shop.TbShopCashSpread;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/repository/TbShopCurrencyRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCurrencyRepository.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/repository/TbShopCurrencyRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCurrencyRepository.java
index 2038da45..8da567d0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/repository/TbShopCurrencyRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopCurrencyRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopCurrency.domain.TbShopCurrency;
+import cn.ysk.cashier.pojo.shop.TbShopCurrency;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/repository/TbShopInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopInfoRepository.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/repository/TbShopInfoRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopInfoRepository.java
index f0c775c2..d20c3f82 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/repository/TbShopInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopInfoRepository.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import org.apache.ibatis.annotations.Insert;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/repository/TbShopPurveyorRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorRepository.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/repository/TbShopPurveyorRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorRepository.java
index 8291ad52..4a4fe85d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/repository/TbShopPurveyorRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/repository/TbShopPurveyorTransactRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorTransactRepository.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/repository/TbShopPurveyorTransactRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorTransactRepository.java
index 713f479a..5dcd7b5b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/repository/TbShopPurveyorTransactRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorTransactRepository.java
@@ -13,18 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.VO.PurveyorTransactVO;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
-import java.util.List;
import java.util.Map;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/repository/TbShopTableRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/repository/TbShopTableRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java
index cc6a342a..a5a3def0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/repository/TbShopTableRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java
@@ -13,16 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.table.domain.TbShopTable;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
-import java.util.List;
-
/**
* @website https://eladmin.vip
* @author lyf
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/repository/TbShopUnitRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUnitRepository.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/repository/TbShopUnitRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUnitRepository.java
index a93060b2..06ff650c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/repository/TbShopUnitRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUnitRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/repository/TbShopUserRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/repository/TbShopUserRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java
index 43d719dc..7f2c037b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/repository/TbShopUserRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopUserRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.repository;
+package cn.ysk.cashier.repository.shop;
-import me.zhengjie.modules.shopInfo.shopUser.domain.TbShopUser;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotButtonConfigService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotButtonConfigService.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotButtonConfigService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/BotButtonConfigService.java
index 9aec3da4..991da2b8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotButtonConfigService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotButtonConfigService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.bot.domain.BotButtonConfig;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigDto;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigQueryCriteria;
+import cn.ysk.cashier.pojo.BotButtonConfig;
+import cn.ysk.cashier.dto.BotButtonConfigDto;
+import cn.ysk.cashier.dto.BotButtonConfigQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotConfigService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotConfigService.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotConfigService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/BotConfigService.java
index a38e01e5..09b0b031 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/BotConfigService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotConfigService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.bot.domain.BotConfig;
-import me.zhengjie.modules.bot.service.dto.BotConfigDto;
-import me.zhengjie.modules.bot.service.dto.BotConfigQueryCriteria;
+import cn.ysk.cashier.pojo.BotConfig;
+import cn.ysk.cashier.dto.BotConfigDto;
+import cn.ysk.cashier.dto.BotConfigQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/BotUserFlowService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserFlowService.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/service/BotUserFlowService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserFlowService.java
index b9f52ad8..9d5c70d5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/BotUserFlowService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserFlowService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.account.domain.BotUserFlow;
-import me.zhengjie.modules.account.service.dto.BotUserFlowDto;
-import me.zhengjie.modules.account.service.dto.BotUserFlowQueryCriteria;
+import cn.ysk.cashier.pojo.BotUserFlow;
+import cn.ysk.cashier.dto.BotUserFlowDto;
+import cn.ysk.cashier.dto.BotUserFlowQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/BotUserService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserService.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/service/BotUserService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserService.java
index b03f119d..af565bad 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/BotUserService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/BotUserService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.user.domain.BotUser;
-import me.zhengjie.modules.user.service.dto.BotUserDto;
-import me.zhengjie.modules.user.service.dto.BotUserQueryCriteria;
+import cn.ysk.cashier.pojo.BotUser;
+import cn.ysk.cashier.dto.BotUserDto;
+import cn.ysk.cashier.dto.BotUserQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/TbProductStockOperateService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbProductStockOperateService.java
similarity index 78%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/TbProductStockOperateService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/TbProductStockOperateService.java
index 76a012a1..4f873799 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/TbProductStockOperateService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbProductStockOperateService.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.service;
+package cn.ysk.cashier.service;
+
+import cn.ysk.cashier.pojo.product.TbProductStockOperate;
+import cn.ysk.cashier.vo.ProductStockOperateVO;
+import cn.ysk.cashier.dto.product.OutAndOnDto;
+import cn.ysk.cashier.dto.product.TbProductStockOperateDto;
+import cn.ysk.cashier.dto.product.TbProductStockOperateQueryCriteria;
-import me.zhengjie.modules.productInfo.productStockOperate.domain.TbProductStockOperate;
-import me.zhengjie.modules.productInfo.productStockOperate.service.VO.ProductStockOperateVO;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.OutAndOnDto;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateDto;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateQueryCriteria;
-import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/TbRenewalsPayLogService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbRenewalsPayLogService.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/TbRenewalsPayLogService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/TbRenewalsPayLogService.java
index b523d6d5..68ed47f6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/TbRenewalsPayLogService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbRenewalsPayLogService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.renewals.domain.TbRenewalsPayLog;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogDto;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogQueryCriteria;
+import cn.ysk.cashier.pojo.TbRenewalsPayLog;
+import cn.ysk.cashier.dto.TbRenewalsPayLogDto;
+import cn.ysk.cashier.dto.TbRenewalsPayLogQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/TbShopPayTypeService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPayTypeService.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/service/TbShopPayTypeService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPayTypeService.java
index 33f1d4cc..95dd566d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/TbShopPayTypeService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPayTypeService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.payType.domain.TbShopPayType;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeDto;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeQueryCriteria;
+import cn.ysk.cashier.pojo.TbShopPayType;
+import cn.ysk.cashier.dto.TbShopPayTypeDto;
+import cn.ysk.cashier.dto.TbShopPayTypeQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/TbUserInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbUserInfoService.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/TbUserInfoService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/TbUserInfoService.java
index 708f22ca..58b86039 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/TbUserInfoService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbUserInfoService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoDto;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoQueryCriteria;
+import cn.ysk.cashier.pojo.TbUserInfo;
+import cn.ysk.cashier.dto.TbUserInfoDto;
+import cn.ysk.cashier.dto.TbUserInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotButtonConfigServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotButtonConfigServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotButtonConfigServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotButtonConfigServiceImpl.java
index c1244246..26fbb9ed 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotButtonConfigServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotButtonConfigServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.bot.domain.BotButtonConfig;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.BotButtonConfig;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.bot.repository.BotButtonConfigRepository;
-import me.zhengjie.modules.bot.service.BotButtonConfigService;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigDto;
-import me.zhengjie.modules.bot.service.dto.BotButtonConfigQueryCriteria;
-import me.zhengjie.modules.bot.service.mapstruct.BotButtonConfigMapper;
+import cn.ysk.cashier.repository.BotButtonConfigRepository;
+import cn.ysk.cashier.service.BotButtonConfigService;
+import cn.ysk.cashier.dto.BotButtonConfigDto;
+import cn.ysk.cashier.dto.BotButtonConfigQueryCriteria;
+import cn.ysk.cashier.mapper.BotButtonConfigMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotConfigServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotConfigServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotConfigServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotConfigServiceImpl.java
index b0f7eb95..cbae7949 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/bot/service/impl/BotConfigServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotConfigServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.bot.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.bot.domain.BotConfig;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.BotConfig;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.bot.repository.BotConfigRepository;
-import me.zhengjie.modules.bot.service.BotConfigService;
-import me.zhengjie.modules.bot.service.dto.BotConfigDto;
-import me.zhengjie.modules.bot.service.dto.BotConfigQueryCriteria;
-import me.zhengjie.modules.bot.service.mapstruct.BotConfigMapper;
+import cn.ysk.cashier.repository.BotConfigRepository;
+import cn.ysk.cashier.service.BotConfigService;
+import cn.ysk.cashier.dto.BotConfigDto;
+import cn.ysk.cashier.dto.BotConfigQueryCriteria;
+import cn.ysk.cashier.mapper.BotConfigMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/impl/BotUserFlowServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserFlowServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/account/service/impl/BotUserFlowServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserFlowServiceImpl.java
index 91814ad9..e59a548d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/account/service/impl/BotUserFlowServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserFlowServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.account.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.account.domain.BotUserFlow;
-import me.zhengjie.modules.account.repository.BotUserFlowRepository;
-import me.zhengjie.modules.account.service.BotUserFlowService;
-import me.zhengjie.modules.account.service.dto.BotUserFlowDto;
-import me.zhengjie.modules.account.service.dto.BotUserFlowQueryCriteria;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.BotUserFlow;
+import cn.ysk.cashier.repository.BotUserFlowRepository;
+import cn.ysk.cashier.service.BotUserFlowService;
+import cn.ysk.cashier.dto.BotUserFlowDto;
+import cn.ysk.cashier.dto.BotUserFlowQueryCriteria;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.account.service.mapstruct.BotUserFlowMapper;
+import cn.ysk.cashier.mapper.BotUserFlowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/impl/BotUserServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserServiceImpl.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/user/service/impl/BotUserServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserServiceImpl.java
index 6ff2b12a..b442eb48 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/user/service/impl/BotUserServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BotUserServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.user.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.user.domain.BotUser;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.BotUser;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.user.repository.BotUserRepository;
-import me.zhengjie.modules.user.service.BotUserService;
-import me.zhengjie.modules.user.service.dto.BotUserDto;
-import me.zhengjie.modules.user.service.dto.BotUserQueryCriteria;
-import me.zhengjie.modules.user.service.mapstruct.BotUserMapper;
+import cn.ysk.cashier.repository.BotUserRepository;
+import cn.ysk.cashier.service.BotUserService;
+import cn.ysk.cashier.dto.BotUserDto;
+import cn.ysk.cashier.dto.BotUserQueryCriteria;
+import cn.ysk.cashier.mapper.BotUserMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/impl/TbRenewalsPayLogServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbRenewalsPayLogServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/impl/TbRenewalsPayLogServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbRenewalsPayLogServiceImpl.java
index eed66fe5..7ecdd84f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/renewals/service/impl/TbRenewalsPayLogServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbRenewalsPayLogServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.renewals.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.renewals.domain.TbRenewalsPayLog;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.TbRenewalsPayLog;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.renewals.repository.TbRenewalsPayLogRepository;
-import me.zhengjie.modules.renewals.service.TbRenewalsPayLogService;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogDto;
-import me.zhengjie.modules.renewals.service.dto.TbRenewalsPayLogQueryCriteria;
-import me.zhengjie.modules.renewals.service.mapstruct.TbRenewalsPayLogMapper;
+import cn.ysk.cashier.repository.TbRenewalsPayLogRepository;
+import cn.ysk.cashier.service.TbRenewalsPayLogService;
+import cn.ysk.cashier.dto.TbRenewalsPayLogDto;
+import cn.ysk.cashier.dto.TbRenewalsPayLogQueryCriteria;
+import cn.ysk.cashier.mapper.TbRenewalsPayLogMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/impl/TbShopPayTypeServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPayTypeServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/payType/service/impl/TbShopPayTypeServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPayTypeServiceImpl.java
index fd648807..9bc50119 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/payType/service/impl/TbShopPayTypeServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPayTypeServiceImpl.java
@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.payType.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.payType.domain.PayTypeEnum;
-import me.zhengjie.modules.payType.repository.TbShopPayTypeRepository;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeDto;
-import me.zhengjie.modules.payType.service.dto.TbShopPayTypeQueryCriteria;
-import me.zhengjie.modules.payType.service.mapstruct.TbShopPayTypeMapper;
-import me.zhengjie.modules.payType.domain.TbShopPayType;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.enums.PayTypeEnum;
+import cn.ysk.cashier.repository.TbShopPayTypeRepository;
+import cn.ysk.cashier.dto.TbShopPayTypeDto;
+import cn.ysk.cashier.dto.TbShopPayTypeQueryCriteria;
+import cn.ysk.cashier.mapper.TbShopPayTypeMapper;
+import cn.ysk.cashier.pojo.TbShopPayType;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.payType.service.TbShopPayTypeService;
+import cn.ysk.cashier.service.TbShopPayTypeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/impl/TbUserInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbUserInfoServiceImpl.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/impl/TbUserInfoServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbUserInfoServiceImpl.java
index b2839126..8aad2858 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/userInfo/service/impl/TbUserInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbUserInfoServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.userInfo.service.impl;
+package cn.ysk.cashier.service.impl;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.TbUserInfo;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.userInfo.repository.TbUserInfoRepository;
-import me.zhengjie.modules.userInfo.service.TbUserInfoService;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoDto;
-import me.zhengjie.modules.userInfo.service.dto.TbUserInfoQueryCriteria;
-import me.zhengjie.modules.userInfo.service.mapstruct.TbUserInfoMapper;
+import cn.ysk.cashier.repository.TbUserInfoRepository;
+import cn.ysk.cashier.service.TbUserInfoService;
+import cn.ysk.cashier.dto.TbUserInfoDto;
+import cn.ysk.cashier.dto.TbUserInfoQueryCriteria;
+import cn.ysk.cashier.mapper.TbUserInfoMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/impl/TbCashierCartServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbCashierCartServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/impl/TbCashierCartServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbCashierCartServiceImpl.java
index fd065c2b..9f2cf34d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/impl/TbCashierCartServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbCashierCartServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.service.impl;
+package cn.ysk.cashier.service.impl.order;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.order.cashierCart.repository.TbCashierCartRepository;
-import me.zhengjie.modules.order.cashierCart.service.TbCashierCartService;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartDto;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartQueryCriteria;
-import me.zhengjie.modules.order.cashierCart.service.mapstruct.TbCashierCartMapper;
+import cn.ysk.cashier.repository.order.TbCashierCartRepository;
+import cn.ysk.cashier.service.order.TbCashierCartService;
+import cn.ysk.cashier.dto.order.TbCashierCartDto;
+import cn.ysk.cashier.dto.order.TbCashierCartQueryCriteria;
+import cn.ysk.cashier.mapper.order.TbCashierCartMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/impl/TbOrderDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderDetailServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/impl/TbOrderDetailServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderDetailServiceImpl.java
index 78482124..89bc430c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/impl/TbOrderDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderDetailServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.service.impl;
+package cn.ysk.cashier.service.impl.order;
-import me.zhengjie.modules.order.orderDetail.domain.TbOrderDetail;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.order.TbOrderDetail;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.order.orderDetail.repository.TbOrderDetailRepository;
-import me.zhengjie.modules.order.orderDetail.service.TbOrderDetailService;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailDto;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailQueryCriteria;
-import me.zhengjie.modules.order.orderDetail.service.mapstruct.TbOrderDetailMapper;
+import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
+import cn.ysk.cashier.service.order.TbOrderDetailService;
+import cn.ysk.cashier.dto.order.TbOrderDetailDto;
+import cn.ysk.cashier.dto.order.TbOrderDetailQueryCriteria;
+import cn.ysk.cashier.mapper.order.TbOrderDetailMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/impl/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
similarity index 90%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/impl/TbOrderInfoServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index 4d9422c1..21747018 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/impl/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -13,19 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.service.impl;
+package cn.ysk.cashier.service.impl.order;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
-import me.zhengjie.modules.order.cashierCart.repository.TbCashierCartRepository;
-import me.zhengjie.modules.order.orderInfo.domain.TbOrderInfo;
-import me.zhengjie.modules.order.orderInfo.service.vo.TbOrderInfoVo;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.repository.order.TbCashierCartRepository;
+import cn.ysk.cashier.pojo.order.TbOrderInfo;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.vo.TbOrderInfoVo;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.order.orderInfo.repository.TbOrderInfoRepository;
-import me.zhengjie.modules.order.orderInfo.service.TbOrderInfoService;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoDto;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoQueryCriteria;
-import me.zhengjie.modules.order.orderInfo.service.mapstruct.TbOrderInfoMapper;
+import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
+import cn.ysk.cashier.service.order.TbOrderInfoService;
+import cn.ysk.cashier.dto.order.TbOrderInfoDto;
+import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria;
+import cn.ysk.cashier.mapper.order.TbOrderInfoMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/impl/TbProductGroupServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/impl/TbProductGroupServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
index 0ec09462..d82a8522 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/impl/TbProductGroupServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
@@ -13,23 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import com.alibaba.fastjson.JSONArray;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.product.repository.TbProductRepository;
-import me.zhengjie.modules.productInfo.productGroup.domain.TbProductGroup;
-import me.zhengjie.modules.productInfo.productGroup.service.vo.AddProduct;
-import me.zhengjie.modules.productInfo.productGroup.repository.TbProductGroupRepository;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupDto;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupQueryCriteria;
-import me.zhengjie.modules.security.service.OnlineUserService;
-import me.zhengjie.modules.security.service.dto.OnlineUserDto;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.pojo.product.TbProduct;
+import cn.ysk.cashier.repository.product.TbProductRepository;
+import cn.ysk.cashier.pojo.product.TbProductGroup;
+import cn.ysk.cashier.utils.*;
+import cn.ysk.cashier.vo.AddProduct;
+import cn.ysk.cashier.repository.product.TbProductGroupRepository;
+import cn.ysk.cashier.dto.product.TbProductGroupDto;
+import cn.ysk.cashier.dto.product.TbProductGroupQueryCriteria;
+import cn.ysk.cashier.config.security.service.OnlineUserService;
+import cn.ysk.cashier.config.security.service.dto.OnlineUserDto;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productGroup.service.TbProductGroupService;
-import me.zhengjie.modules.productInfo.productGroup.service.mapstruct.TbProductGroupMapper;
+import cn.ysk.cashier.service.product.TbProductGroupService;
+import cn.ysk.cashier.mapper.product.TbProductGroupMapper;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/impl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/impl/TbProductServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index bbf022f7..6b8d520f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/impl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
+import cn.ysk.cashier.utils.*;
import com.alibaba.fastjson.JSONArray;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.product.domain.TbProductVo;
-import me.zhengjie.modules.productInfo.product.repository.TbProductRepository;
-import me.zhengjie.modules.productInfo.product.service.TbProductService;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductDto;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductQueryCriteria;
-import me.zhengjie.modules.productInfo.product.service.mapstruct.TbProductMapper;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
-import me.zhengjie.modules.productInfo.productSkuResult.repository.TbProductSkuResultRepository;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
-import me.zhengjie.modules.productInfo.productSpec.repository.TbProductSpecRepository;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.repository.TbProductSkuRepository;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
-import me.zhengjie.modules.shopInfo.shopUnit.repository.TbShopUnitRepository;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.product.TbProduct;
+import cn.ysk.cashier.vo.TbProductVo;
+import cn.ysk.cashier.repository.product.TbProductRepository;
+import cn.ysk.cashier.service.product.TbProductService;
+import cn.ysk.cashier.dto.product.TbProductDto;
+import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
+import cn.ysk.cashier.mapper.product.TbProductMapper;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
+import cn.ysk.cashier.repository.product.TbProductSkuResultRepository;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
+import cn.ysk.cashier.repository.product.TbProductSpecRepository;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.repository.product.TbProductSkuRepository;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
+import cn.ysk.cashier.repository.shop.TbShopUnitRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/impl/TbProductSkuResultServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuResultServiceImpl.java
similarity index 83%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/impl/TbProductSkuResultServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuResultServiceImpl.java
index 46795893..5a1ffc87 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/impl/TbProductSkuResultServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuResultServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productSkuResult.repository.TbProductSkuResultRepository;
-import me.zhengjie.modules.productInfo.productSkuResult.service.TbProductSkuResultService;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultDto;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultQueryCriteria;
-import me.zhengjie.modules.productInfo.productSkuResult.service.mapstruct.TbProductSkuResultMapper;
+import cn.ysk.cashier.repository.product.TbProductSkuResultRepository;
+import cn.ysk.cashier.service.product.TbProductSkuResultService;
+import cn.ysk.cashier.dto.product.TbProductSkuResultDto;
+import cn.ysk.cashier.dto.product.TbProductSkuResultQueryCriteria;
+import cn.ysk.cashier.repository.product.TbProductSkuResultMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/impl/TbProductSkuServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/impl/TbProductSkuServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
index 032683c2..eb8a9269 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/impl/TbProductSkuServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuQueryCriteria;
-import me.zhengjie.modules.productInfo.productSku.service.mapstruct.TbProductSkuMapper;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.dto.product.TbProductSkuQueryCriteria;
+import cn.ysk.cashier.mapper.product.TbProductSkuMapper;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productSku.repository.TbProductSkuRepository;
-import me.zhengjie.modules.productInfo.productSku.service.TbProductSkuService;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuDto;
+import cn.ysk.cashier.repository.product.TbProductSkuRepository;
+import cn.ysk.cashier.service.product.TbProductSkuService;
+import cn.ysk.cashier.dto.product.TbProductSkuDto;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/impl/TbProductSpecServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSpecServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/impl/TbProductSpecServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSpecServiceImpl.java
index 499fcb7a..e51ac842 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/impl/TbProductSpecServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSpecServiceImpl.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
-import me.zhengjie.modules.productInfo.productSpec.repository.TbProductSpecRepository;
-import me.zhengjie.modules.productInfo.productSpec.service.TbProductSpecService;
-import me.zhengjie.modules.productInfo.productSpec.service.VO.TbProductSpecVo;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.SpecDto;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecDto;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecQueryCriteria;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
+import cn.ysk.cashier.repository.product.TbProductSpecRepository;
+import cn.ysk.cashier.service.product.TbProductSpecService;
+import cn.ysk.cashier.utils.*;
+import cn.ysk.cashier.vo.TbProductSpecVo;
+import cn.ysk.cashier.dto.product.SpecDto;
+import cn.ysk.cashier.dto.product.TbProductSpecDto;
+import cn.ysk.cashier.dto.product.TbProductSpecQueryCriteria;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productSpec.service.mapstruct.TbProductSpecMapper;
+import cn.ysk.cashier.mapper.product.TbProductSpecMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
index 7333bb43..17c1e0e2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/impl/TbProductStockDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
@@ -13,31 +13,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productStock.repository.TbProductStockDetailRepository;
-import me.zhengjie.modules.productInfo.productStock.service.TbProductStockDetailService;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailDto;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailQueryCriteria;
-import me.zhengjie.modules.productInfo.productStock.service.mapstruct.TbProductStockDetailMapper;
+import cn.ysk.cashier.repository.product.TbProductStockDetailRepository;
+import cn.ysk.cashier.service.product.TbProductStockDetailService;
+import cn.ysk.cashier.dto.product.TbProductStockDetailDto;
+import cn.ysk.cashier.dto.product.TbProductStockDetailQueryCriteria;
+import cn.ysk.cashier.mapper.product.TbProductStockDetailMapper;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.math.BigDecimal;
import java.util.*;
import java.io.IOException;
-import javax.persistence.criteria.*;
import javax.servlet.http.HttpServletResponse;
/**
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/impl/TbProductStockOperateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/impl/TbProductStockOperateServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
index d5885975..7d758241 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStockOperate/service/impl/TbProductStockOperateServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
@@ -13,36 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStockOperate.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import cn.hutool.core.bean.BeanUtil;
+import cn.ysk.cashier.utils.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.repository.TbProductSkuRepository;
-import me.zhengjie.modules.productInfo.productSku.service.TbProductSkuService;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import me.zhengjie.modules.productInfo.productStockOperate.domain.TbProductStockOperate;
-import me.zhengjie.modules.productInfo.productStockOperate.service.VO.ProductStockOperateVO;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.OutAndOnDto;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.ProductListDto;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shop.repository.TbShopInfoRepository;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.repository.product.TbProductSkuRepository;
+import cn.ysk.cashier.service.product.TbProductSkuService;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
+import cn.ysk.cashier.pojo.product.TbProductStockOperate;
+import cn.ysk.cashier.vo.ProductStockOperateVO;
+import cn.ysk.cashier.dto.product.OutAndOnDto;
+import cn.ysk.cashier.dto.product.ProductListDto;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.repository.TbShopPurveyorTransactRepository;
-import me.zhengjie.modules.userInfo.domain.TbUserInfo;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
+import cn.ysk.cashier.repository.shop.TbShopPurveyorTransactRepository;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productStockOperate.repository.TbProductStockOperateRepository;
-import me.zhengjie.modules.productInfo.productStockOperate.service.TbProductStockOperateService;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateDto;
-import me.zhengjie.modules.productInfo.productStockOperate.service.dto.TbProductStockOperateQueryCriteria;
-import me.zhengjie.modules.productInfo.productStockOperate.service.mapstruct.TbProductStockOperateMapper;
-import org.bouncycastle.asn1.dvcs.DVCSObjectIdentifiers;
+import cn.ysk.cashier.repository.product.TbProductStockOperateRepository;
+import cn.ysk.cashier.service.TbProductStockOperateService;
+import cn.ysk.cashier.dto.product.TbProductStockOperateDto;
+import cn.ysk.cashier.dto.product.TbProductStockOperateQueryCriteria;
+import cn.ysk.cashier.mapper.product.TbProductStockOperateMapper;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
@@ -50,11 +46,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import java.math.BigDecimal;
import java.time.Instant;
import java.util.*;
import java.io.IOException;
-import javax.annotation.Resource;
import javax.persistence.EntityManager;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/impl/TbShopCategoryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/impl/TbShopCategoryServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
index 1d404365..097700dc 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/impl/TbShopCategoryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
@@ -13,19 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.service.impl;
+package cn.ysk.cashier.service.impl.productimpl;
-import cn.hutool.core.bean.BeanUtil;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.productInfo.productCategory.repository.TbShopCategoryRepository;
-import me.zhengjie.modules.productInfo.productCategory.service.TbShopCategoryService;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryDto;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryQueryCriteria;
-import me.zhengjie.modules.productInfo.productCategory.service.mapstruct.TbShopCategoryMapper;
+import cn.ysk.cashier.repository.product.TbShopCategoryRepository;
+import cn.ysk.cashier.service.product.TbShopCategoryService;
+import cn.ysk.cashier.dto.product.TbShopCategoryDto;
+import cn.ysk.cashier.dto.product.TbShopCategoryQueryCriteria;
+import cn.ysk.cashier.mapper.product.TbShopCategoryMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
@@ -33,8 +32,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
@@ -43,7 +42,6 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.prefs.BackingStoreException;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/impl/TbMerchantAccountServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantAccountServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/impl/TbMerchantAccountServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantAccountServiceImpl.java
index a0b2624d..96492881 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/impl/TbMerchantAccountServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantAccountServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.merchantAccount.repository.TbMerchantAccountRepository;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.TbMerchantAccountService;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountDto;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountQueryCriteria;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.mapstruct.TbMerchantAccountMapper;
+import cn.ysk.cashier.repository.shop.TbMerchantAccountRepository;
+import cn.ysk.cashier.service.shop.TbMerchantAccountService;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountDto;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbMerchantAccountMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/impl/TbMerchantRegisterServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/impl/TbMerchantRegisterServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
index 4564d273..feb605c3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/impl/TbMerchantRegisterServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
@@ -13,27 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import com.baomidou.mybatisplus.extension.api.R;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopRegister.repository.TbMerchantRegisterRepository;
-import me.zhengjie.modules.shopInfo.shopRegister.service.TbMerchantRegisterService;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopRegister.service.mapstruct.TbMerchantRegisterMapper;
+import cn.ysk.cashier.repository.shop.TbMerchantRegisterRepository;
+import cn.ysk.cashier.service.shop.TbMerchantRegisterService;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbMerchantRegisterMapper;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/impl/TbMerchantThirdApplyServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantThirdApplyServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/impl/TbMerchantThirdApplyServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantThirdApplyServiceImpl.java
index 7639e6f6..71c97a13 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/impl/TbMerchantThirdApplyServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantThirdApplyServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopThirdApply.domain.TbMerchantThirdApply;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopThirdApply.repository.TbMerchantThirdApplyRepository;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.TbMerchantThirdApplyService;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyDto;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.mapstruct.TbMerchantThirdApplyMapper;
+import cn.ysk.cashier.repository.shop.TbMerchantThirdApplyRepository;
+import cn.ysk.cashier.service.shop.TbMerchantThirdApplyService;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyDto;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbMerchantThirdApplyMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
index 42394e87..8780b3a9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopStaff.repository.TbPlussShopStaffRepository;
-import me.zhengjie.modules.shopInfo.shopStaff.service.TbPlussShopStaffService;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffDto;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopStaff.service.mapstruct.TbPlussShopStaffMapper;
+import cn.ysk.cashier.repository.shop.TbPlussShopStaffRepository;
+import cn.ysk.cashier.service.shop.TbPlussShopStaffService;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffDto;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbPlussShopStaffMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/impl/TbPrintMachineServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/impl/TbPrintMachineServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java
index 10079c28..29cb28be 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/impl/TbPrintMachineServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPrintMachineServiceImpl.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import com.alibaba.fastjson.JSONArray;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.shopInfo.shopPrint.domain.TbPrintMachine;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.PrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineVO;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.controller.shop.TbPrintMachine;
+import cn.ysk.cashier.dto.shop.PrintMachineDto;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.ListUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.vo.TbPrintMachineVO;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopPrint.repository.TbPrintMachineRepository;
-import me.zhengjie.modules.shopInfo.shopPrint.service.TbPrintMachineService;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopPrint.service.mapstruct.TbPrintMachineMapper;
+import cn.ysk.cashier.repository.shop.TbPrintMachineRepository;
+import cn.ysk.cashier.service.shop.TbPrintMachineService;
+import cn.ysk.cashier.dto.shop.TbPrintMachineDto;
+import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbPrintMachineMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/impl/TbReceiptSalesServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbReceiptSalesServiceImpl.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/impl/TbReceiptSalesServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbReceiptSalesServiceImpl.java
index 9c5147df..a6b3889c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/impl/TbReceiptSalesServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbReceiptSalesServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.domain.TbReceiptSales;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.mapstruct.TbReceiptSalesMapper;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbReceiptSales;
+import cn.ysk.cashier.mapper.shop.TbReceiptSalesMapper;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.repository.TbReceiptSalesRepository;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.TbReceiptSalesService;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesDto;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesQueryCriteria;
+import cn.ysk.cashier.repository.shop.TbReceiptSalesRepository;
+import cn.ysk.cashier.service.shop.TbReceiptSalesService;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesDto;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesQueryCriteria;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/impl/TbShopAreaServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopAreaServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/impl/TbShopAreaServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopAreaServiceImpl.java
index cb7993e0..50985015 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/impl/TbShopAreaServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopAreaServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopArea.domain.TbShopArea;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.mapper.shop.TbShopAreaMapper;
+import cn.ysk.cashier.pojo.shop.TbShopArea;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopArea.repository.TbShopAreaRepository;
-import me.zhengjie.modules.shopInfo.shopArea.service.TbShopAreaService;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaDto;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopArea.service.mapstruct.TbShopAreaMapper;
+import cn.ysk.cashier.repository.shop.TbShopAreaRepository;
+import cn.ysk.cashier.service.shop.TbShopAreaService;
+import cn.ysk.cashier.dto.shop.TbShopAreaDto;
+import cn.ysk.cashier.dto.shop.TbShopAreaQueryCriteria;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/impl/TbShopCashSpreadServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCashSpreadServiceImpl.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/impl/TbShopCashSpreadServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCashSpreadServiceImpl.java
index 60d00921..ed790ae3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/impl/TbShopCashSpreadServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCashSpreadServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopSpread.domain.TbShopCashSpread;
-import me.zhengjie.modules.shopInfo.shopSpread.service.TbShopCashSpreadService;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadDto;
-import me.zhengjie.modules.shopInfo.shopSpread.service.mapstruct.TbShopCashSpreadMapper;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbShopCashSpread;
+import cn.ysk.cashier.service.shop.TbShopCashSpreadService;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadDto;
+import cn.ysk.cashier.mapper.shop.TbShopCashSpreadMapper;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopSpread.repository.TbShopCashSpreadRepository;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadQueryCriteria;
+import cn.ysk.cashier.repository.shop.TbShopCashSpreadRepository;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadQueryCriteria;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/impl/TbShopCurrencyServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCurrencyServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/impl/TbShopCurrencyServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCurrencyServiceImpl.java
index cbc46712..936412ee 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/impl/TbShopCurrencyServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopCurrencyServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopCurrency.domain.TbShopCurrency;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbShopCurrency;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopCurrency.repository.TbShopCurrencyRepository;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.TbShopCurrencyService;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyDto;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.mapstruct.TbShopCurrencyMapper;
+import cn.ysk.cashier.repository.shop.TbShopCurrencyRepository;
+import cn.ysk.cashier.service.shop.TbShopCurrencyService;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyDto;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopCurrencyMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/impl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/impl/TbShopInfoServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
index f97e111e..0a74294d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/impl/TbShopInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
@@ -13,28 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import cn.hutool.core.bean.BeanUtil;
-import lombok.Data;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
-import me.zhengjie.modules.shopInfo.merchantAccount.repository.TbMerchantAccountRepository;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
-import me.zhengjie.modules.shopInfo.shopRegister.repository.TbMerchantRegisterRepository;
-import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.domain.Job;
-import me.zhengjie.modules.system.domain.Role;
-import me.zhengjie.modules.system.domain.User;
-import me.zhengjie.modules.system.repository.UserRepository;
-import me.zhengjie.utils.*;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.repository.shop.TbMerchantAccountRepository;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
+import cn.ysk.cashier.repository.shop.TbMerchantRegisterRepository;
+import cn.ysk.cashier.system.domain.Dept;
+import cn.ysk.cashier.system.domain.Job;
+import cn.ysk.cashier.system.domain.Role;
+import cn.ysk.cashier.system.domain.User;
+import cn.ysk.cashier.system.repository.UserRepository;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shop.repository.TbShopInfoRepository;
-import me.zhengjie.modules.shopInfo.shop.service.TbShopInfoService;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoDto;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoQueryCriteria;
-import me.zhengjie.modules.shopInfo.shop.service.mapstruct.TbShopInfoMapper;
+import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
+import cn.ysk.cashier.service.shop.TbShopInfoService;
+import cn.ysk.cashier.dto.shop.TbShopInfoDto;
+import cn.ysk.cashier.dto.shop.TbShopInfoQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopInfoMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
@@ -42,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import java.sql.Timestamp;
import java.time.Instant;
import java.util.*;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/impl/TbShopPurveyorServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/impl/TbShopPurveyorServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorServiceImpl.java
index bd62a9e1..b8cecc88 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/impl/TbShopPurveyorServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopPurveyor.repository.TbShopPurveyorRepository;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.TbShopPurveyorService;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorDto;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.mapstruct.TbShopPurveyorMapper;
+import cn.ysk.cashier.repository.shop.TbShopPurveyorRepository;
+import cn.ysk.cashier.service.shop.TbShopPurveyorService;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorDto;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopPurveyorMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/impl/TbShopPurveyorTransactServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/impl/TbShopPurveyorTransactServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
index 795830d9..989a8b5d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/impl/TbShopPurveyorTransactServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
@@ -13,29 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
-import me.zhengjie.modules.shopInfo.shopPurveyor.repository.TbShopPurveyorRepository;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.VO.PurveyorTransactSumVO;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.VO.PurveyorTransactVO;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.repository.shop.TbShopPurveyorRepository;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
+import cn.ysk.cashier.vo.PurveyorTransactVO;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.repository.TbShopPurveyorTransactRepository;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.TbShopPurveyorTransactService;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactDto;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.mapstruct.TbShopPurveyorTransactMapper;
+import cn.ysk.cashier.repository.shop.TbShopPurveyorTransactRepository;
+import cn.ysk.cashier.service.shop.TbShopPurveyorTransactService;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactDto;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopPurveyorTransactMapper;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.QueryHelp;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -45,9 +42,6 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.servlet.http.HttpServletResponse;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
/**
* @website https://eladmin.vip
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
similarity index 89%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 497754a3..8133ee26 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -13,24 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import lombok.Value;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.shopInfo.table.domain.TbShopTable;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.table.repository.TbShopTableRepository;
-import me.zhengjie.modules.shopInfo.table.service.TbShopTableService;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableDto;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableQueryCriteria;
-import me.zhengjie.modules.shopInfo.table.service.mapstruct.TbShopTableMapper;
+import cn.ysk.cashier.repository.shop.TbShopTableRepository;
+import cn.ysk.cashier.service.shop.TbShopTableService;
+import cn.ysk.cashier.dto.shop.TbShopTableDto;
+import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopTableMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.*;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/impl/TbShopUnitServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/impl/TbShopUnitServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java
index bdf02100..276b337a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/impl/TbShopUnitServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUnitServiceImpl.java
@@ -13,26 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.exception.NewBadRequestException;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.exception.NewBadRequestException;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopUnit.repository.TbShopUnitRepository;
-import me.zhengjie.modules.shopInfo.shopUnit.service.TbShopUnitService;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitDto;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopUnit.service.mapstruct.TbShopUnitMapper;
+import cn.ysk.cashier.repository.shop.TbShopUnitRepository;
+import cn.ysk.cashier.service.shop.TbShopUnitService;
+import cn.ysk.cashier.dto.shop.TbShopUnitDto;
+import cn.ysk.cashier.dto.shop.TbShopUnitQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopUnitMapper;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.time.Instant;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/impl/TbShopUserServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/impl/TbShopUserServiceImpl.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
index c6b83a92..98c481b2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/impl/TbShopUserServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.service.impl;
+package cn.ysk.cashier.service.impl.shopimpl;
-import me.zhengjie.modules.shopInfo.shopUser.domain.TbShopUser;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
+import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.shopInfo.shopUser.repository.TbShopUserRepository;
-import me.zhengjie.modules.shopInfo.shopUser.service.TbShopUserService;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserDto;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopUser.service.mapstruct.TbShopUserMapper;
+import cn.ysk.cashier.repository.shop.TbShopUserRepository;
+import cn.ysk.cashier.service.shop.TbShopUserService;
+import cn.ysk.cashier.dto.shop.TbShopUserDto;
+import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
+import cn.ysk.cashier.mapper.shop.TbShopUserMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/TbCashierCartService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbCashierCartService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/TbCashierCartService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbCashierCartService.java
index a023d556..25a424a8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/cashierCart/service/TbCashierCartService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbCashierCartService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.cashierCart.service;
+package cn.ysk.cashier.service.order;
-import me.zhengjie.modules.order.cashierCart.domain.TbCashierCart;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartDto;
-import me.zhengjie.modules.order.cashierCart.service.dto.TbCashierCartQueryCriteria;
+import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.dto.order.TbCashierCartDto;
+import cn.ysk.cashier.dto.order.TbCashierCartQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/TbOrderDetailService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderDetailService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/TbOrderDetailService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderDetailService.java
index e8cf387d..61c89b4e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderDetail/service/TbOrderDetailService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderDetailService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderDetail.service;
+package cn.ysk.cashier.service.order;
-import me.zhengjie.modules.order.orderDetail.domain.TbOrderDetail;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailDto;
-import me.zhengjie.modules.order.orderDetail.service.dto.TbOrderDetailQueryCriteria;
+import cn.ysk.cashier.pojo.order.TbOrderDetail;
+import cn.ysk.cashier.dto.order.TbOrderDetailDto;
+import cn.ysk.cashier.dto.order.TbOrderDetailQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/TbOrderInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/TbOrderInfoService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
index 8e40c9d7..35615d29 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/order/orderInfo/service/TbOrderInfoService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.order.orderInfo.service;
+package cn.ysk.cashier.service.order;
-import me.zhengjie.modules.order.orderInfo.domain.TbOrderInfo;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoDto;
-import me.zhengjie.modules.order.orderInfo.service.dto.TbOrderInfoQueryCriteria;
+import cn.ysk.cashier.pojo.order.TbOrderInfo;
+import cn.ysk.cashier.dto.order.TbOrderInfoDto;
+import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/TbProductGroupService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductGroupService.java
similarity index 82%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/TbProductGroupService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductGroupService.java
index 82a726e1..d04dc3cb 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productGroup/service/TbProductGroupService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductGroupService.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productGroup.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.productGroup.domain.TbProductGroup;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupDto;
-import me.zhengjie.modules.productInfo.productGroup.service.dto.TbProductGroupQueryCriteria;
-import me.zhengjie.modules.productInfo.productGroup.service.vo.AddProduct;
+import cn.ysk.cashier.pojo.product.TbProduct;
+import cn.ysk.cashier.pojo.product.TbProductGroup;
+import cn.ysk.cashier.dto.product.TbProductGroupDto;
+import cn.ysk.cashier.dto.product.TbProductGroupQueryCriteria;
+import cn.ysk.cashier.vo.AddProduct;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/TbProductService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/TbProductService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
index 8e7f6d4d..da71364e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/product/service/TbProductService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.product.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.product.domain.TbProduct;
-import me.zhengjie.modules.productInfo.product.domain.TbProductVo;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductDto;
-import me.zhengjie.modules.productInfo.product.service.dto.TbProductQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbProduct;
+import cn.ysk.cashier.vo.TbProductVo;
+import cn.ysk.cashier.dto.product.TbProductDto;
+import cn.ysk.cashier.dto.product.TbProductQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/TbProductSkuResultService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuResultService.java
similarity index 85%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/TbProductSkuResultService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuResultService.java
index 2c7b7c56..63ff4331 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSkuResult/service/TbProductSkuResultService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuResultService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSkuResult.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.productSkuResult.domain.TbProductSkuResult;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultDto;
-import me.zhengjie.modules.productInfo.productSkuResult.service.dto.TbProductSkuResultQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbProductSkuResult;
+import cn.ysk.cashier.dto.product.TbProductSkuResultDto;
+import cn.ysk.cashier.dto.product.TbProductSkuResultQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/TbProductSkuService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/TbProductSkuService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuService.java
index 0614d6ef..84b3e864 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSku/service/TbProductSkuService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSkuService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSku.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.productSku.domain.TbProductSku;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuQueryCriteria;
-import me.zhengjie.modules.productInfo.productSku.service.dto.TbProductSkuDto;
+import cn.ysk.cashier.pojo.product.TbProductSku;
+import cn.ysk.cashier.dto.product.TbProductSkuQueryCriteria;
+import cn.ysk.cashier.dto.product.TbProductSkuDto;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/TbProductSpecService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSpecService.java
similarity index 84%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/TbProductSpecService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSpecService.java
index e577f5e6..2bafe864 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productSpec/service/TbProductSpecService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductSpecService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productSpec.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.SpecDto;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecDto;
-import me.zhengjie.modules.productInfo.productSpec.service.dto.TbProductSpecQueryCriteria;
-import me.zhengjie.modules.productInfo.productSpec.domain.TbProductSpec;
+import cn.ysk.cashier.dto.product.SpecDto;
+import cn.ysk.cashier.dto.product.TbProductSpecDto;
+import cn.ysk.cashier.dto.product.TbProductSpecQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbProductSpec;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/TbProductStockDetailService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductStockDetailService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/TbProductStockDetailService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductStockDetailService.java
index 8e2d597b..a3783d29 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productStock/service/TbProductStockDetailService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductStockDetailService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productStock.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.productStock.domain.TbProductStockDetail;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailDto;
-import me.zhengjie.modules.productInfo.productStock.service.dto.TbProductStockDetailQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbProductStockDetail;
+import cn.ysk.cashier.dto.product.TbProductStockDetailDto;
+import cn.ysk.cashier.dto.product.TbProductStockDetailQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.math.BigDecimal;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/TbShopCategoryService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbShopCategoryService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/TbShopCategoryService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbShopCategoryService.java
index b55961ad..21547d16 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/productInfo/productCategory/service/TbShopCategoryService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbShopCategoryService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.productInfo.productCategory.service;
+package cn.ysk.cashier.service.product;
-import me.zhengjie.modules.productInfo.productCategory.domain.TbShopCategory;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryDto;
-import me.zhengjie.modules.productInfo.productCategory.service.dto.TbShopCategoryQueryCriteria;
+import cn.ysk.cashier.pojo.product.TbShopCategory;
+import cn.ysk.cashier.dto.product.TbShopCategoryDto;
+import cn.ysk.cashier.dto.product.TbShopCategoryQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/TbMerchantAccountService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantAccountService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/TbMerchantAccountService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantAccountService.java
index 9e2eecbb..b2a1f02b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/merchantAccount/service/TbMerchantAccountService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantAccountService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.merchantAccount.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.merchantAccount.domain.TbMerchantAccount;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountDto;
-import me.zhengjie.modules.shopInfo.merchantAccount.service.dto.TbMerchantAccountQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountDto;
+import cn.ysk.cashier.dto.shop.TbMerchantAccountQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/TbMerchantRegisterService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantRegisterService.java
similarity index 84%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/TbMerchantRegisterService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantRegisterService.java
index 162d45fc..64843fd3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopRegister/service/TbMerchantRegisterService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantRegisterService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopRegister.service;
+package cn.ysk.cashier.service.shop;
+
+import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto;
+import cn.ysk.cashier.dto.shop.TbMerchantRegisterQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto;
-import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterQueryCriteria;
-import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
import java.io.IOException;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/TbMerchantThirdApplyService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantThirdApplyService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/TbMerchantThirdApplyService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantThirdApplyService.java
index ce1a013e..467da038 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopThirdApply/service/TbMerchantThirdApplyService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbMerchantThirdApplyService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopThirdApply.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopThirdApply.domain.TbMerchantThirdApply;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyDto;
-import me.zhengjie.modules.shopInfo.shopThirdApply.service.dto.TbMerchantThirdApplyQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyDto;
+import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/TbPlussShopStaffService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPlussShopStaffService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/TbPlussShopStaffService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPlussShopStaffService.java
index e91c66c9..92a0769f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/TbPlussShopStaffService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPlussShopStaffService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopStaff.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffDto;
-import me.zhengjie.modules.shopInfo.shopStaff.service.dto.TbPlussShopStaffQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffDto;
+import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/TbPrintMachineService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java
similarity index 81%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/TbPrintMachineService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java
index d161d27d..b8410f1f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPrint/service/TbPrintMachineService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbPrintMachineService.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPrint.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopPrint.domain.TbPrintMachine;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.PrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineDto;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineQueryCriteria;
-import me.zhengjie.modules.shopInfo.shopPrint.service.dto.TbPrintMachineVO;
+import cn.ysk.cashier.controller.shop.TbPrintMachine;
+import cn.ysk.cashier.dto.shop.PrintMachineDto;
+import cn.ysk.cashier.dto.shop.TbPrintMachineDto;
+import cn.ysk.cashier.dto.shop.TbPrintMachineQueryCriteria;
+import cn.ysk.cashier.vo.TbPrintMachineVO;
import org.springframework.data.domain.Pageable;
-import java.util.Map;
+
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/TbReceiptSalesService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbReceiptSalesService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/TbReceiptSalesService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbReceiptSalesService.java
index 3f359517..304e84b3 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopReceiptSales/service/TbReceiptSalesService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbReceiptSalesService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopReceiptSales.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.domain.TbReceiptSales;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesDto;
-import me.zhengjie.modules.shopInfo.shopReceiptSales.service.dto.TbReceiptSalesQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbReceiptSales;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesDto;
+import cn.ysk.cashier.dto.shop.TbReceiptSalesQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/TbShopAreaService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopAreaService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/TbShopAreaService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopAreaService.java
index 85aa2dad..766e1d35 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopArea/service/TbShopAreaService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopAreaService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopArea.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopArea.domain.TbShopArea;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaDto;
-import me.zhengjie.modules.shopInfo.shopArea.service.dto.TbShopAreaQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopArea;
+import cn.ysk.cashier.dto.shop.TbShopAreaDto;
+import cn.ysk.cashier.dto.shop.TbShopAreaQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/TbShopCashSpreadService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCashSpreadService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/TbShopCashSpreadService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCashSpreadService.java
index e5626d51..97dfc581 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopSpread/service/TbShopCashSpreadService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCashSpreadService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopSpread.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopSpread.domain.TbShopCashSpread;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadDto;
-import me.zhengjie.modules.shopInfo.shopSpread.service.dto.TbShopCashSpreadQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopCashSpread;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadDto;
+import cn.ysk.cashier.dto.shop.TbShopCashSpreadQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/TbShopCurrencyService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCurrencyService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/TbShopCurrencyService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCurrencyService.java
index 69bcf6b9..3ffad699 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopCurrency/service/TbShopCurrencyService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopCurrencyService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopCurrency.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopCurrency.domain.TbShopCurrency;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyDto;
-import me.zhengjie.modules.shopInfo.shopCurrency.service.dto.TbShopCurrencyQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopCurrency;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyDto;
+import cn.ysk.cashier.dto.shop.TbShopCurrencyQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/TbShopInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopInfoService.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/TbShopInfoService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopInfoService.java
index 48123cfa..3d6014b5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shop/service/TbShopInfoService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopInfoService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shop.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shop.domain.TbShopInfo;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoDto;
-import me.zhengjie.modules.shopInfo.shop.service.dto.TbShopInfoQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
+import cn.ysk.cashier.dto.shop.TbShopInfoDto;
+import cn.ysk.cashier.dto.shop.TbShopInfoQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/TbShopPurveyorService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorService.java
similarity index 86%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/TbShopPurveyorService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorService.java
index 878823fa..08e3b8c2 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyor/service/TbShopPurveyorService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyor.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopPurveyor.domain.TbShopPurveyor;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorDto;
-import me.zhengjie.modules.shopInfo.shopPurveyor.service.dto.TbShopPurveyorQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorDto;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/TbShopPurveyorTransactService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorTransactService.java
similarity index 80%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/TbShopPurveyorTransactService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorTransactService.java
index d66716c2..c30af3be 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopPurveyorTransact/service/TbShopPurveyorTransactService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopPurveyorTransactService.java
@@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopPurveyorTransact.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.domain.TbShopPurveyorTransact;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.VO.PurveyorTransactSumVO;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.VO.PurveyorTransactVO;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactDto;
-import me.zhengjie.modules.shopInfo.shopPurveyorTransact.service.dto.TbShopPurveyorTransactQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactDto;
+import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
similarity index 88%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
index b3fcb496..2af0070f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.table.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.table.domain.TbShopTable;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableDto;
-import me.zhengjie.modules.shopInfo.table.service.dto.TbShopTableQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
+import cn.ysk.cashier.dto.shop.TbShopTableDto;
+import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/TbShopUnitService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUnitService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/TbShopUnitService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUnitService.java
index 24bca9ec..4d1a8419 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUnit/service/TbShopUnitService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUnitService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUnit.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopUnit.domain.TbShopUnit;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitDto;
-import me.zhengjie.modules.shopInfo.shopUnit.service.dto.TbShopUnitQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopUnit;
+import cn.ysk.cashier.dto.shop.TbShopUnitDto;
+import cn.ysk.cashier.dto.shop.TbShopUnitQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/TbShopUserService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUserService.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/TbShopUserService.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUserService.java
index 58d0c2f3..21636264 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopUser/service/TbShopUserService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopUserService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.shopInfo.shopUser.service;
+package cn.ysk.cashier.service.shop;
-import me.zhengjie.modules.shopInfo.shopUser.domain.TbShopUser;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserDto;
-import me.zhengjie.modules.shopInfo.shopUser.service.dto.TbShopUserQueryCriteria;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
+import cn.ysk.cashier.dto.shop.TbShopUserDto;
+import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dept.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dept.java
index 9f28af21..1b39ce20 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dept.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java
index 689cf2e3..985925c0 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Dict.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java
index 554dde61..77afc863 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Job.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Job.java
index f2d358a6..85de0c53 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Job.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java
index c74be950..1e030f8a 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Menu.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java
index d33d75c1..c14a5fe1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
-import me.zhengjie.utils.enums.DataScopeEnum;
+import cn.ysk.cashier.base.BaseEntity;
+import cn.ysk.cashier.utils.enums.DataScopeEnum;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/User.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/User.java
index fe28773b..e39c8993 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/User.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain;
+package cn.ysk.cashier.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuMetaVo.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuMetaVo.java
index 76539c08..5057834d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuMetaVo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain.vo;
+package cn.ysk.cashier.system.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuVo.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuVo.java
index 82fc0cc5..3abddad8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/MenuVo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain.vo;
+package cn.ysk.cashier.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/UserPassVo.java
similarity index 94%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/UserPassVo.java
index fccb100f..625c0271 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/vo/UserPassVo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.domain.vo;
+package cn.ysk.cashier.system.domain.vo;
import lombok.Data;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DeptRepository.java
similarity index 95%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DeptRepository.java
index 98583224..870e815f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DeptRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.Dept;
+import cn.ysk.cashier.system.domain.Dept;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictDetailRepository.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictDetailRepository.java
index d28159cb..d80f61b4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictDetailRepository.java
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.DictDetail;
+import cn.ysk.cashier.system.domain.DictDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
import java.util.List;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictRepository.java
similarity index 93%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictRepository.java
index 48e2a258..0a1ef54c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/DictRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.Dict;
+import cn.ysk.cashier.system.domain.Dict;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/JobRepository.java
similarity index 92%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/JobRepository.java
index e39ebf00..a439ae3f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/JobRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.Job;
+import cn.ysk.cashier.system.domain.Job;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java
index 75fd7ff5..89f5fba4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/MenuRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.Menu;
+import cn.ysk.cashier.system.domain.Menu;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/RoleRepository.java
similarity index 96%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/RoleRepository.java
index 8e76cc55..73824704 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/RoleRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.Role;
+import cn.ysk.cashier.system.domain.Role;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
similarity index 97%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
index c5c88a8d..159daff8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/repository/UserRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.repository;
+package cn.ysk.cashier.system.repository;
-import me.zhengjie.modules.system.domain.User;
+import cn.ysk.cashier.system.domain.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DeptController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DeptController.java
index 99624306..fd854166 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DeptController.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.rest;
+package cn.ysk.cashier.system.rest;
import cn.hutool.core.collection.CollectionUtil;
+import cn.ysk.cashier.system.domain.Dept;
+import cn.ysk.cashier.system.service.dto.DeptDto;
+import cn.ysk.cashier.system.service.dto.DeptQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.service.DeptService;
-import me.zhengjie.modules.system.service.dto.DeptDto;
-import me.zhengjie.modules.system.service.dto.DeptQueryCriteria;
-import me.zhengjie.utils.PageUtil;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.system.service.DeptService;
+import cn.ysk.cashier.utils.PageUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictController.java
similarity index 91%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictController.java
index 5156e308..ad2f5b0b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictController.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.rest;
+package cn.ysk.cashier.system.rest;
+import cn.ysk.cashier.system.domain.Dict;
+import cn.ysk.cashier.system.service.dto.DictQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.Dict;
-import me.zhengjie.modules.system.service.DictService;
-import me.zhengjie.modules.system.service.dto.DictQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.system.service.DictService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictDetailController.java
similarity index 87%
rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictDetailController.java
index 7170110c..7a3336e6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/DictDetailController.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.modules.system.rest;
+package cn.ysk.cashier.system.rest;
+import cn.ysk.cashier.system.domain.DictDetail;
+import cn.ysk.cashier.system.service.dto.DictDetailDto;
+import cn.ysk.cashier.system.service.dto.DictDetailQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.DictDetail;
-import me.zhengjie.modules.system.service.DictDetailService;
-import me.zhengjie.modules.system.service.dto.DictDetailDto;
-import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.system.service.DictDetailService;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
@@ -52,7 +52,7 @@ public class DictDetailController {
@ApiOperation("查询字典详情")
@GetMapping
public ResponseEntity
- me.zhengjie
+ cn.ysk.cashieross-service2.6
@@ -45,7 +45,7 @@
${alipay.version}
- me.zhengjie
+ cn.ysk.cashieross-service2.6compile
diff --git a/eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java b/eladmin-tools/src/main/java/cn/ysk/cashier/config/MultipartConfig.java
similarity index 97%
rename from eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/config/MultipartConfig.java
index cf04de5c..ba64c0c4 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/config/MultipartConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.config;
+package cn.ysk.cashier.config;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.context.annotation.Bean;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/AlipayConfig.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/AlipayConfig.java
index def695d9..345809b6 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/AlipayConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/EmailConfig.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/EmailConfig.java
index b4fc1e6d..d490becf 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/EmailConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/LocalStorage.java
similarity index 96%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/LocalStorage.java
index 59fd0ab8..2c605914 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/LocalStorage.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.base.BaseEntity;
+import cn.ysk.cashier.base.BaseEntity;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuConfig.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuConfig.java
index 0247e673..a5265c96 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuConfig.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuContent.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuContent.java
index db69a6a6..56740dba 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/QiniuContent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain;
+package cn.ysk.cashier.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/EmailVo.java
similarity index 97%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/EmailVo.java
index 1fb759f5..36620225 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/EmailVo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain.vo;
+package cn.ysk.cashier.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/TradeVo.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/TradeVo.java
index 01c1c2fd..c1b8846e 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/domain/vo/TradeVo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.domain.vo;
+package cn.ysk.cashier.domain.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/AliPayRepository.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/repository/AliPayRepository.java
index 61183b43..2908eac6 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/AliPayRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.AlipayConfig;
+import cn.ysk.cashier.domain.AlipayConfig;
import org.springframework.data.jpa.repository.JpaRepository;
/**
diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/EmailRepository.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/repository/EmailRepository.java
index 7765602c..cf983165 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/EmailRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.EmailConfig;
+import cn.ysk.cashier.domain.EmailConfig;
import org.springframework.data.jpa.repository.JpaRepository;
/**
diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/LocalStorageRepository.java
similarity index 92%
rename from eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/repository/LocalStorageRepository.java
index 8c1e85af..cd772a40 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/LocalStorageRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.LocalStorage;
+import cn.ysk.cashier.domain.LocalStorage;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiNiuConfigRepository.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiNiuConfigRepository.java
index 9379f55b..a400f083 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiNiuConfigRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.QiniuConfig;
+import cn.ysk.cashier.domain.QiniuConfig;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiniuContentRepository.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiniuContentRepository.java
index 55f813f5..166c6513 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/repository/QiniuContentRepository.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.repository;
+package cn.ysk.cashier.repository;
-import me.zhengjie.domain.QiniuContent;
+import cn.ysk.cashier.domain.QiniuContent;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/AliPayController.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/rest/AliPayController.java
index 0c03d0ae..5d8bf487 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/AliPayController.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.annotation.rest.AnonymousGetMapping;
+import cn.ysk.cashier.domain.AlipayConfig;
+import cn.ysk.cashier.domain.vo.TradeVo;
+import cn.ysk.cashier.service.AliPayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.AnonymousAccess;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.domain.vo.TradeVo;
-import me.zhengjie.domain.AlipayConfig;
-import me.zhengjie.utils.AliPayStatusEnum;
-import me.zhengjie.utils.AlipayUtils;
-import me.zhengjie.service.AliPayService;
+import cn.ysk.cashier.annotation.AnonymousAccess;
+import cn.ysk.cashier.utils.AliPayStatusEnum;
+import cn.ysk.cashier.utils.AlipayUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/EmailController.java
similarity index 90%
rename from eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/rest/EmailController.java
index 952f8ba2..7784fbeb 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/EmailController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.domain.EmailConfig;
+import cn.ysk.cashier.domain.vo.EmailVo;
+import cn.ysk.cashier.service.EmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.domain.vo.EmailVo;
-import me.zhengjie.domain.EmailConfig;
-import me.zhengjie.service.EmailService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/LocalStorageController.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/rest/LocalStorageController.java
index 45f39366..02c46d94 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/LocalStorageController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.domain.LocalStorage;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.service.LocalStorageService;
+import cn.ysk.cashier.service.dto.LocalStorageQueryCriteria;
+import cn.ysk.cashier.utils.FileUtil;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.domain.LocalStorage;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.service.LocalStorageService;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
-import me.zhengjie.utils.FileUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java
similarity index 95%
rename from eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java
index fe30aaed..e36601d0 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.rest;
+package cn.ysk.cashier.rest;
+import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.domain.QiniuConfig;
+import cn.ysk.cashier.domain.QiniuContent;
+import cn.ysk.cashier.service.QiNiuService;
+import cn.ysk.cashier.service.dto.QiniuQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.Log;
-import me.zhengjie.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
-import me.zhengjie.service.QiNiuService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/AliPayService.java
similarity index 92%
rename from eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/AliPayService.java
index be19c905..be558565 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/AliPayService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.vo.TradeVo;
-import me.zhengjie.domain.AlipayConfig;
+import cn.ysk.cashier.domain.AlipayConfig;
+import cn.ysk.cashier.domain.vo.TradeVo;
/**
* @author Zheng Jie
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/EmailService.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/EmailService.java
index aabfcb0a..02d4d1f1 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/EmailService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.vo.EmailVo;
-import me.zhengjie.domain.EmailConfig;
+import cn.ysk.cashier.domain.EmailConfig;
+import cn.ysk.cashier.domain.vo.EmailVo;
/**
* @author Zheng Jie
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/LocalStorageService.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/LocalStorageService.java
index 6df06243..c99dfd7e 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/LocalStorageService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
-import me.zhengjie.domain.LocalStorage;
-import me.zhengjie.service.dto.LocalStorageDto;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
+import cn.ysk.cashier.domain.LocalStorage;
+import cn.ysk.cashier.service.dto.LocalStorageDto;
+import cn.ysk.cashier.service.dto.LocalStorageQueryCriteria;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/QiNiuService.java
similarity index 94%
rename from eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/QiNiuService.java
index 7591ee0a..e92988ff 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/QiNiuService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service;
+package cn.ysk.cashier.service;
+import cn.ysk.cashier.domain.QiniuConfig;
+import cn.ysk.cashier.domain.QiniuContent;
+import cn.ysk.cashier.service.dto.QiniuQueryCriteria;
import com.dianguang.cloud.ossservice.config.CloudStorageConfig;
-import me.zhengjie.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageDto.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageDto.java
index 14221c2a..b88a1242 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageDto.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Getter;
import lombok.Setter;
-import me.zhengjie.base.BaseDTO;
+import cn.ysk.cashier.base.BaseDTO;
import java.io.Serializable;
/**
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageQueryCriteria.java
similarity index 92%
rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageQueryCriteria.java
index bea1cc7c..751bc1bf 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/LocalStorageQueryCriteria.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
/**
* @author Zheng Jie
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/PictureQueryCriteria.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/PictureQueryCriteria.java
index e7d4f1b1..2e4d6b75 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/PictureQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/QiniuQueryCriteria.java
similarity index 92%
rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/QiniuQueryCriteria.java
index f5c2240b..11e0a8c0 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/dto/QiniuQueryCriteria.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.dto;
+package cn.ysk.cashier.service.dto;
import lombok.Data;
-import me.zhengjie.annotation.Query;
+import cn.ysk.cashier.annotation.Query;
import java.sql.Timestamp;
import java.util.List;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/AliPayServiceImpl.java
similarity index 94%
rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/AliPayServiceImpl.java
index 0625ba42..c617d8a3 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/AliPayServiceImpl.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
+import cn.ysk.cashier.domain.AlipayConfig;
+import cn.ysk.cashier.domain.vo.TradeVo;
+import cn.ysk.cashier.exception.BadRequestException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradePagePayRequest;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.vo.TradeVo;
-import me.zhengjie.domain.AlipayConfig;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.AliPayRepository;
-import me.zhengjie.service.AliPayService;
+import cn.ysk.cashier.repository.AliPayRepository;
+import cn.ysk.cashier.service.AliPayService;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/EmailServiceImpl.java
similarity index 91%
rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/EmailServiceImpl.java
index c98c76ec..dcd28c1c 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/EmailServiceImpl.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import cn.hutool.extra.mail.Mail;
import cn.hutool.extra.mail.MailAccount;
+import cn.ysk.cashier.domain.EmailConfig;
+import cn.ysk.cashier.domain.vo.EmailVo;
+import cn.ysk.cashier.exception.BadRequestException;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.EmailConfig;
-import me.zhengjie.domain.vo.EmailVo;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.EmailRepository;
-import me.zhengjie.service.EmailService;
-import me.zhengjie.utils.EncryptUtils;
+import cn.ysk.cashier.repository.EmailRepository;
+import cn.ysk.cashier.service.EmailService;
+import cn.ysk.cashier.utils.EncryptUtils;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/LocalStorageServiceImpl.java
similarity index 90%
rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/LocalStorageServiceImpl.java
index 77174c44..3caaa802 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/LocalStorageServiceImpl.java
@@ -13,19 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import cn.hutool.core.util.ObjectUtil;
+import cn.ysk.cashier.domain.LocalStorage;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.config.FileProperties;
-import me.zhengjie.domain.LocalStorage;
-import me.zhengjie.service.dto.LocalStorageDto;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
-import me.zhengjie.service.mapstruct.LocalStorageMapper;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.utils.*;
-import me.zhengjie.repository.LocalStorageRepository;
-import me.zhengjie.service.LocalStorageService;
+import cn.ysk.cashier.config.FileProperties;
+import cn.ysk.cashier.service.dto.LocalStorageDto;
+import cn.ysk.cashier.service.dto.LocalStorageQueryCriteria;
+import cn.ysk.cashier.service.mapstruct.LocalStorageMapper;
+import cn.ysk.cashier.utils.*;
+import cn.ysk.cashier.repository.LocalStorageRepository;
+import cn.ysk.cashier.service.LocalStorageService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.File;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/QiNiuServiceImpl.java
similarity index 93%
rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/QiNiuServiceImpl.java
index f07281cb..606f5fd3 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/impl/QiNiuServiceImpl.java
@@ -13,33 +13,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.impl;
+package cn.ysk.cashier.service.impl;
import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import cn.ysk.cashier.domain.QiniuConfig;
+import cn.ysk.cashier.exception.BadRequestException;
import com.dianguang.cloud.ossservice.config.CloudStorageConfig;
import com.dianguang.cloud.ossservice.service.OSSFactory;
import com.qiniu.common.QiniuException;
-import com.qiniu.http.Response;
import com.qiniu.storage.BucketManager;
import com.qiniu.storage.Configuration;
-import com.qiniu.storage.UploadManager;
-import com.qiniu.storage.model.DefaultPutRet;
import com.qiniu.storage.model.FileInfo;
import com.qiniu.util.Auth;
import lombok.RequiredArgsConstructor;
-import me.zhengjie.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
-import me.zhengjie.repository.QiniuContentRepository;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
-import me.zhengjie.utils.QiNiuUtil;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.QiNiuConfigRepository;
-import me.zhengjie.service.QiNiuService;
-import me.zhengjie.utils.FileUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import me.zhengjie.utils.ValidationUtil;
+import cn.ysk.cashier.domain.QiniuContent;
+import cn.ysk.cashier.repository.QiniuContentRepository;
+import cn.ysk.cashier.service.dto.QiniuQueryCriteria;
+import cn.ysk.cashier.utils.QiNiuUtil;
+import cn.ysk.cashier.repository.QiNiuConfigRepository;
+import cn.ysk.cashier.service.QiNiuService;
+import cn.ysk.cashier.utils.FileUtil;
+import cn.ysk.cashier.utils.PageUtil;
+import cn.ysk.cashier.utils.QueryHelp;
+import cn.ysk.cashier.utils.ValidationUtil;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheConfig;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java b/eladmin-tools/src/main/java/cn/ysk/cashier/service/mapstruct/LocalStorageMapper.java
similarity index 83%
rename from eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/service/mapstruct/LocalStorageMapper.java
index 4c6d9555..0ba5686f 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/service/mapstruct/LocalStorageMapper.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.service.mapstruct;
+package cn.ysk.cashier.service.mapstruct;
-import me.zhengjie.base.BaseMapper;
-import me.zhengjie.service.dto.LocalStorageDto;
-import me.zhengjie.domain.LocalStorage;
+import cn.ysk.cashier.base.BaseMapper;
+import cn.ysk.cashier.domain.LocalStorage;
+import cn.ysk.cashier.service.dto.LocalStorageDto;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/AliPayStatusEnum.java
similarity index 97%
rename from eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/utils/AliPayStatusEnum.java
index c114fd16..224f454c 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/AliPayStatusEnum.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
/**
* 支付状态
diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/AlipayUtils.java
similarity index 97%
rename from eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/utils/AlipayUtils.java
index 203f7db7..01d9cc2c 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/AlipayUtils.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
+import cn.ysk.cashier.domain.AlipayConfig;
import com.alipay.api.AlipayApiException;
import com.alipay.api.internal.util.AlipaySignature;
-import me.zhengjie.domain.AlipayConfig;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/QiNiuUtil.java
similarity index 98%
rename from eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java
rename to eladmin-tools/src/main/java/cn/ysk/cashier/utils/QiNiuUtil.java
index 8091a95d..3a7e8251 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java
+++ b/eladmin-tools/src/main/java/cn/ysk/cashier/utils/QiNiuUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
import com.qiniu.storage.Region;
import java.text.SimpleDateFormat;
diff --git a/oss-service/pom.xml b/oss-service/pom.xml
index ecd2ada1..334a6d02 100644
--- a/oss-service/pom.xml
+++ b/oss-service/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
eladmin
- me.zhengjie
+ cn.ysk.cashier2.64.0.0
diff --git a/pom.xml b/pom.xml
index 79543860..dc2e1007 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- me.zhengjie
+ cn.ysk.cashiereladminpom2.6
diff --git a/product/category/index.vue b/product/category/index.vue
new file mode 100644
index 00000000..52e36490
--- /dev/null
+++ b/product/category/index.vue
@@ -0,0 +1,156 @@
+
+