diff --git a/pom.xml b/pom.xml
index 94022ba3..d32bb2ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,13 +45,6 @@
 
 
     <dependencies>
-
-        <!--Spring boot start-->
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0.2</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -132,11 +125,6 @@
             <artifactId>swagger-models</artifactId>
             <version>1.5.21</version>
         </dependency>
-    <!--    <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.6</version>
-        </dependency>-->
         <!--单应用-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
@@ -225,13 +213,6 @@
             <artifactId>UserAgentUtils</artifactId>
             <version>1.20</version>
         </dependency>
-
-
-
-
-
-
-
     </dependencies>
 
     <build>
diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java
index f3981ee0..75b90fe2 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java
@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
 import java.math.BigDecimal;
 
 /**
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
index fa0b9008..d5d50746 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
@@ -12,8 +12,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
diff --git a/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java b/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
index f629adc7..a0e6005d 100644
--- a/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
+++ b/yshop-mproot/src/main/java/co/yixiang/annotation/Query.java
@@ -23,16 +23,6 @@ public @interface Query {
     // Dong ZhaoYang 2017/8/7 查询方式
     Type type() default Type.EQUAL;
 
-    /**
-     * 连接查询的属性名，如User类中的dept
-     */
-    String joinName() default "";
-
-    /**
-     * 默认左连接
-     */
-    Join join() default Join.LEFT;
-
     /**
      * 多字段模糊搜索，仅支持String类型字段，多个用逗号隔开, 如@Query(blurry = "email,username")
      */
@@ -65,14 +55,5 @@ public @interface Query {
         ,UNIX_TIMESTAMP
     }
 
-    /**
-     * @author Zheng Jie
-     * 适用于简单连接查询，复杂的请自定义该注解，或者使用sql查询
-     */
-    enum Join {
-        /** jie 2019-6-4 13:18:30 左右连接 */
-        LEFT, RIGHT
-    }
-
 }
 
diff --git a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
index bc0554b5..0675063a 100644
--- a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
+++ b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java
@@ -7,7 +7,6 @@ package co.yixiang.common.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import co.yixiang.common.web.vo.Paging;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import co.yixiang.annotation.Query;
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
index ab17ecee..54085d0a 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-
 import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.math.BigDecimal;
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
index 0935b566..4fb6d03d 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
diff --git a/yshop-system/src/main/resources/template/generator/admin/Entity.ftl b/yshop-system/src/main/resources/template/generator/admin/Entity.ftl
index 743e6255..0bc0b96f 100644
--- a/yshop-system/src/main/resources/template/generator/admin/Entity.ftl
+++ b/yshop-system/src/main/resources/template/generator/admin/Entity.ftl
@@ -11,7 +11,7 @@ package ${package}.domain;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 <#if isNotNullColumns??>
 import javax.validation.constraints.*;
 </#if>
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java
index bdebfda7..5221cdd3 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import java.io.Serializable;
 
 /**
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java
index 3ad75b29..e7f3e542 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java
index bddbeff8..1986d477 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java
index 1533c1c3..5e0f38c3 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import javax.validation.constraints.*;
 import java.io.Serializable;
 
diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java
index b85afbc9..8d387417 100644
--- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java
+++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
 import java.sql.Timestamp;
 import java.io.Serializable;