调整目录结构

buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java

@@ -5,8 +5,8 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberWallet;

buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java

@@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.sms.SmsUtil;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.MemberEditDTO;

buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java

@@ -3,7 +3,7 @@ package cn.lili.controller.passport.connect;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.AuthCallback;

buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java

@@ -1,6 +1,6 @@
 package cn.lili.controller.passport.connect;
 
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;

buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java

@@ -6,7 +6,7 @@ import cn.lili.common.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;

common-api/src/main/java/cn/lili/controller/common/SliderImageController.java

@@ -1,11 +1,11 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.common.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-api/src/main/java/cn/lili/controller/common/SmsController.java

@@ -1,12 +1,12 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.common.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.sms.SmsUtil;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java

@@ -1,7 +1,7 @@
-package cn.lili.common.aop.limiter.annotation;
+package cn.lili.common.cache.limit.annotation;
 
 
-import cn.lili.common.aop.limiter.LimitType;
+import cn.lili.common.cache.limit.enums.LimitTypeEnums;
 
 import java.lang.annotation.*;
 
@@ -60,5 +60,5 @@ public @interface LimitPoint {
      *
      * @return LimitType
      */
-    LimitType limitType() default LimitType.IP;
+    LimitTypeEnums limitType() default LimitTypeEnums.IP;
 }

framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java

@@ -1,4 +1,4 @@
-package cn.lili.common.aop.limiter;
+package cn.lili.common.cache.limit.enums;
 
 
 /**
@@ -8,7 +8,7 @@ package cn.lili.common.aop.limiter;
  * @since 2018年2月02日 下午4:58:52
  */
 
-public enum LimitType {
+public enum LimitTypeEnums {
     /**
      * 自定义key(即全局限流)
      */

framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java

@@ -1,6 +1,7 @@
-package cn.lili.common.aop.limiter;
+package cn.lili.common.cache.limit.interceptor;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.common.cache.limit.enums.LimitTypeEnums;
+import cn.lili.common.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import com.google.common.collect.ImmutableList;
@@ -43,12 +44,12 @@ public class LimitInterceptor {
 
     @Before("@annotation(limitPointAnnotation)")
     public void interceptor(LimitPoint limitPointAnnotation) {
-        LimitType limitType = limitPointAnnotation.limitType();
+        LimitTypeEnums limitTypeEnums = limitPointAnnotation.limitType();
         String name = limitPointAnnotation.name();
         String key;
         int limitPeriod = limitPointAnnotation.period();
         int limitCount = limitPointAnnotation.limit();
-        switch (limitType) {
+        switch (limitTypeEnums) {
             case CUSTOMER:
                 key = limitPointAnnotation.key();
                 break;

framework/src/main/java/cn/lili/common/security/context/UserContext.java

@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
-import cn.lili.common.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

framework/src/main/java/cn/lili/common/security/token/PermissionEnum.java

@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 /**
  * 权限枚举值

framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;

framework/src/main/java/cn/lili/common/security/token/Token.java

@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 import lombok.Data;
 

framework/src/main/java/cn/lili/common/security/token/TokenUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 import cn.lili.common.cache.Cache;
 import cn.lili.common.cache.CachePrefix;

framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java

@@ -1,7 +1,7 @@
-package cn.lili.common.token.base;
+package cn.lili.common.security.token.base;
 
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 
 /**
  * AbstractToken

framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java

@@ -1,13 +1,13 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.common.security.token.base.generate;
 
 import cn.lili.common.cache.Cache;
 import cn.lili.common.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.PermissionEnum;
+import cn.lili.common.security.token.PermissionEnum;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.TokenUtil;
+import cn.lili.common.security.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.vo.UserMenuVO;
 import cn.lili.modules.permission.service.AdminUserService;

framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java

@@ -1,10 +1,10 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.common.security.token.base.generate;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.TokenUtil;
+import cn.lili.common.security.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.config.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.dos.Member;

framework/src/main/java/cn/lili/common/security/token/base/generate/StoreTokenGenerate.java

@@ -1,12 +1,12 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.common.security.token.base.generate;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.TokenUtil;
+import cn.lili.common.security.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.store.entity.dos.Store;

framework/src/main/java/cn/lili/common/sms/SmsUtil.java

@@ -1,6 +1,6 @@
 package cn.lili.common.sms;
 
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
 
 import java.util.List;
 import java.util.Map;

framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java

@@ -10,7 +10,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.sms.AliSmsUtil;
 import cn.lili.common.sms.SmsUtil;
 import cn.lili.common.utils.CommonUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
 import cn.lili.config.properties.SmsTemplateSetting;
 import cn.lili.config.properties.SystemSetting;
 import cn.lili.modules.connect.util.Base64Utils;

framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.entity;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.connect.entity.enums.ConnectConfigEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.service;
 
 import cn.lili.common.cache.CachePrefix;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java

@@ -8,8 +8,8 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.base.generate.MemberTokenGenerate;
+import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
 import cn.lili.common.utils.CookieUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.config.context.ThreadContextHolder;

framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java

@@ -6,7 +6,7 @@ import cn.lili.common.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.config.properties.ApiProperties;
 import cn.lili.config.properties.DomainProperties;

framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO;
 import cn.lili.modules.distribution.entity.enums.DistributionStatusEnum;

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

framework/src/main/java/cn/lili/modules/file/entity/File.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.file.entity;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.enums.DraftGoodsSaveType;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -2,7 +2,7 @@ package cn.lili.modules.goods.entity.dos;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;

framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java

@@ -1,17 +1,13 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.validation.Phone;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.goods.entity.dos.GoodsSku;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java

@@ -1,11 +1,10 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/member/service/MemberService.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.member.service;
 
 
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.member.entity.dos.Member;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -11,9 +11,9 @@ import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.common.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.base.generate.MemberTokenGenerate;
+import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
-import cn.lili.common.token.base.generate.StoreTokenGenerate;
+import cn.lili.common.security.token.base.generate.StoreTokenGenerate;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
 import cn.lili.config.context.ThreadContextHolder;

framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.message.entity.enums.MessageStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.message.entity.enums.RangeEnum;
 import cn.lili.modules.message.entity.enums.MessageSendClient;
 import com.baomidou.mybatisplus.annotation.TableField;

framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.order.order.entity.dos;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.dos;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;

framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.vo;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.order.order.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -8,7 +8,7 @@ import cn.hutool.json.JSONUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.trigger.util.DelayQueueTools;
 import cn.lili.common.trigger.enums.DelayTypeEnums;
 import cn.lili.common.trigger.message.PintuanOrderMessage;

framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.page.entity.enums.ArticleEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.page.entity.enums.ArticleCategoryEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java

@@ -1,7 +1,5 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
-import cn.lili.common.utils.SnowFlake;
 import cn.lili.modules.page.entity.enums.FeedbackTypeEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.enums.ClientTypeEnum;

framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java

@@ -1,11 +1,10 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dto;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.permission.service;
 
 
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.dto.AdminUserDTO;
 import cn.lili.modules.permission.entity.vo.AdminUserVO;

framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java

@@ -1,12 +1,12 @@
 package cn.lili.modules.permission.serviceimpl;
 
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
-import cn.lili.common.token.base.generate.ManagerTokenGenerate;
+import cn.lili.common.security.token.base.generate.ManagerTokenGenerate;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.permission.entity.dos.AdminUser;

framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java

@@ -3,7 +3,7 @@ package cn.lili.modules.promotion.entity.dos;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.promotion.entity.enums.CouponRangeDayEnum;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java

@@ -1,12 +1,11 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;

framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.promotion.entity.dos;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dto;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.purchase.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java

@@ -1,7 +1,5 @@
 package cn.lili.modules.purchase.entity.dos;
 
-import cn.lili.base.BaseEntity;
-import cn.lili.common.utils.SnowFlake;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.search.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.store.entity.enums.FreightTemplateEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;

framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;