更改目录结构

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">
     <parent>
         <artifactId>eladmin</artifactId>
-        <groupId>me.zhengjie</groupId>
+        <groupId>cn.ysk.cashier</groupId>
         <version>2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,12 +21,12 @@
     <dependencies>
         <!-- 代码生成模块 -->
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>cn.ysk.cashier</groupId>
             <artifactId>eladmin-generator</artifactId>
             <version>2.6</version>
             <exclusions>
                 <exclusion>
-                    <groupId>me.zhengjie</groupId>
+                    <groupId>cn.ysk.cashier</groupId>
                     <artifactId>eladmin-common</artifactId>
                 </exclusion>
             </exclusions>
@@ -34,7 +34,7 @@
 
         <!-- tools 模块包含了 common 和 logging 模块 -->
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>cn.ysk.cashier</groupId>
             <artifactId>eladmin-tools</artifactId>
             <version>2.6</version>
         </dependency>

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 &

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 
 /**
  * 验证码配置枚举

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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.*;

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;

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.*;

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.*;

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.*;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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;

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.*;

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;

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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;

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

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;

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;

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

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

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;

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

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;

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

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;

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

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;

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

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;

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

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;

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

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;

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;

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;
 

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;

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;

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

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

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;

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

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;

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

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;