From 6653d88b691ae100742c5a5e2b5459eba5f749cd Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 30 Aug 2023 16:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E9=9B=86=E6=88=90MyBatis-Plu?=
 =?UTF-8?q?s=E4=BD=BF=E5=BE=97=E7=BC=96=E7=A0=81=E6=9B=B4=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  10 +-
 ruoyi-common/ruoyi-common-core/pom.xml        |   9 +-
 .../common/core/web/domain/BaseEntity.java    |  11 +-
 ruoyi-common/ruoyi-common-security/pom.xml    |   6 +-
 ruoyi-modules/ruoyi-gen/pom.xml               |   4 +-
 .../java/com/ruoyi/gen/domain/GenTable.java   |  11 +-
 .../com/ruoyi/gen/domain/GenTableColumn.java  |   7 +-
 .../mapper/generator/GenTableColumnMapper.xml |   8 +-
 .../mapper/generator/GenTableMapper.xml       |  12 +-
 .../src/main/resources/vm/java/domain.java.vm |   4 +-
 .../src/main/resources/vm/java/mapper.java.vm |   3 +-
 .../main/resources/vm/java/service.java.vm    |   2 +-
 .../resources/vm/java/serviceImpl.java.vm     |   2 +-
 .../src/main/resources/vm/xml/mapper.xml.vm   |  12 +-
 ruoyi-modules/ruoyi-system/pom.xml            |  13 +-
 .../system/domain/BuildingInfoDetail.java     |   8 +-
 .../ruoyi/system/domain/BuildingLabel.java    |   8 +-
 .../ruoyi/system/domain/BuildingTeamRel.java  |  15 +-
 .../com/ruoyi/system/domain/CameraInfo.java   |   8 +-
 .../com/ruoyi/system/domain/Competition.java  |   9 +-
 .../system/domain/CompetitionMembers.java     |   8 +-
 .../domain/CompetitionMembersScore.java       |   8 +-
 .../system/domain/CompetitionOfTeam.java      |   8 +-
 .../system/domain/CompetitionResult.java      |  10 +-
 .../domain/CompetitionSharePermissions.java   |   7 +-
 .../system/domain/CompetitionTeamGroup.java   |   7 +-
 .../system/domain/CompetitionTeamVsTeam.java  |   8 +-
 .../com/ruoyi/system/domain/FeatureLabel.java |   8 +-
 .../com/ruoyi/system/domain/FollowUp.java     |  17 +-
 .../ruoyi/system/domain/GlobalAttachment.java |   8 +-
 .../com/ruoyi/system/domain/GroupWechat.java  |   8 +-
 .../java/com/ruoyi/system/domain/Message.java | 156 +-----------------
 .../com/ruoyi/system/domain/TeamMembers.java  |   8 +-
 .../com/ruoyi/system/domain/TrainingInfo.java |   8 +-
 .../ruoyi/system/domain/UserBuildingRel.java  |   8 +-
 .../com/ruoyi/system/domain/UserRole.java     |   8 +-
 .../ruoyi/system/domain/UserWxAqrCode.java    |   8 +-
 .../ruoyi/system/domain/WxBasketballTeam.java |   7 +-
 .../ruoyi/system/domain/WxBuildingInfo.java   |   8 +-
 .../java/com/ruoyi/system/domain/WxUser.java  |   8 +-
 .../mapper/BuildingInfoDetailMapper.java      |   2 +-
 .../system/mapper/BuildingLabelMapper.java    |   2 +-
 .../system/mapper/BuildingTeamRelMapper.java  |   2 +-
 .../ruoyi/system/mapper/CameraInfoMapper.java |   2 +-
 .../system/mapper/CompetitionMapper.java      |   2 +-
 .../mapper/CompetitionMembersMapper.java      |   2 +-
 .../mapper/CompetitionMembersScoreMapper.java |   2 +-
 .../mapper/CompetitionOfTeamMapper.java       |   2 +-
 .../mapper/CompetitionResultMapper.java       |   2 +-
 .../CompetitionSharePermissionsMapper.java    |   2 +-
 .../mapper/CompetitionTeamGroupMapper.java    |   2 +-
 .../mapper/CompetitionTeamVsTeamMapper.java   |   2 +-
 .../system/mapper/CustomerOrderMapper.java    |   6 +-
 .../system/mapper/FeatureLabelMapper.java     |   2 +-
 .../ruoyi/system/mapper/FollowUpMapper.java   |   6 +-
 .../system/mapper/GlobalAttachmentMapper.java |   2 +-
 .../system/mapper/GroupWechatMapper.java      |   2 +-
 .../ruoyi/system/mapper/MessageMapper.java    |   2 +-
 .../system/mapper/TeamMembersMapper.java      |   2 +-
 .../system/mapper/TrainingInfoMapper.java     |   2 +-
 .../system/mapper/UserBuildingRelMapper.java  |   2 +-
 .../ruoyi/system/mapper/UserRoleMapper.java   |   2 +-
 .../system/mapper/UserWxAqrCodeMapper.java    |   2 +-
 .../system/mapper/WxBasketballTeamMapper.java |   2 +-
 .../system/mapper/WxBuildingInfoMapper.java   |   2 +-
 .../com/ruoyi/system/mapper/WxUserMapper.java |   2 +-
 .../service/IBuildingInfoDetailService.java   |   2 +-
 .../system/service/IBuildingLabelService.java |   2 +-
 .../service/IBuildingTeamRelService.java      |   2 +-
 .../system/service/ICameraInfoService.java    |   2 +-
 .../ICompetitionMembersScoreService.java      |   2 +-
 .../service/ICompetitionMembersService.java   |   2 +-
 .../service/ICompetitionOfTeamService.java    |   2 +-
 .../service/ICompetitionResultService.java    |   2 +-
 .../system/service/ICompetitionService.java   |   2 +-
 .../ICompetitionSharePermissionsService.java  |   2 +-
 .../service/ICompetitionTeamGroupService.java |   2 +-
 .../ICompetitionTeamVsTeamService.java        |   2 +-
 .../system/service/ICustomerOrderService.java |   2 +-
 .../system/service/IFeatureLabelService.java  |   2 +-
 .../system/service/IFollowUpService.java      |   2 +-
 .../service/IGlobalAttachmentService.java     |   2 +-
 .../system/service/IGroupWechatService.java   |   2 +-
 .../ruoyi/system/service/IMessageService.java |   2 +-
 .../system/service/ITeamMembersService.java   |   2 +-
 .../system/service/ITrainingInfoService.java  |   2 +-
 .../service/IUserBuildingRelService.java      |   2 +-
 .../system/service/IUserRoleService.java      |   2 +-
 .../system/service/IUserWxAqrCodeService.java |   2 +-
 .../service/IWxBasketballTeamService.java     |   2 +-
 .../service/IWxBuildingInfoService.java       |   2 +-
 .../ruoyi/system/service/IWxUserService.java  |   2 +-
 .../impl/BuildingInfoDetailServiceImpl.java   |   4 +-
 .../impl/BuildingLabelServiceImpl.java        |   2 +-
 .../impl/BuildingTeamRelServiceImpl.java      |   2 +-
 .../service/impl/CameraInfoServiceImpl.java   |   2 +-
 .../CompetitionMembersScoreServiceImpl.java   |   2 +-
 .../impl/CompetitionMembersServiceImpl.java   |   2 +-
 .../impl/CompetitionOfTeamServiceImpl.java    |   2 +-
 .../impl/CompetitionResultServiceImpl.java    |   2 +-
 .../service/impl/CompetitionServiceImpl.java  |   2 +-
 ...ompetitionSharePermissionsServiceImpl.java |   2 +-
 .../impl/CompetitionTeamGroupServiceImpl.java |   2 +-
 .../CompetitionTeamVsTeamServiceImpl.java     |  29 ++--
 .../impl/CustomerOrderServiceImpl.java        |   2 +-
 .../service/impl/FeatureLabelServiceImpl.java |   2 +-
 .../service/impl/FollowUpServiceImpl.java     |   2 +-
 .../impl/GlobalAttachmentServiceImpl.java     |   2 +-
 .../service/impl/GroupWechatServiceImpl.java  |   2 +-
 .../service/impl/MessageServiceImpl.java      |   2 +-
 .../service/impl/TeamMembersServiceImpl.java  |   2 +-
 .../service/impl/TrainingInfoServiceImpl.java |   2 +-
 .../impl/UserBuildingRelServiceImpl.java      |   2 +-
 .../service/impl/UserRoleServiceImpl.java     |   2 +-
 .../impl/UserWxAqrCodeServiceImpl.java        |   3 +-
 .../impl/WxBasketballTeamServiceImpl.java     |   2 +-
 .../impl/WxBuildingInfoServiceImpl.java       |   2 +-
 .../service/impl/WxUserServiceImpl.java       |   2 +-
 .../mapper/system/BuildingTeamRelMapper.xml   |   8 +-
 .../mapper/system/CameraInfoMapper.xml        |   8 +-
 .../mapper/system/CompetitionMapper.xml       |   8 +-
 .../system/CompetitionMembersMapper.xml       |   8 +-
 .../system/CompetitionMembersScoreMapper.xml  |   8 +-
 .../mapper/system/CompetitionOfTeamMapper.xml |   6 +-
 .../mapper/system/CompetitionResultMapper.xml |   8 +-
 .../CompetitionSharePermissionsMapper.xml     |   8 +-
 .../system/CompetitionTeamGroupMapper.xml     |   8 +-
 .../system/CompetitionTeamVsTeamMapper.xml    |   6 +-
 .../mapper/system/CustomerMapper.xml          |  12 +-
 .../mapper/system/CustomerOrderMapper.xml     |   8 +-
 .../mapper/system/DataDictionaryMapper.xml    |   8 +-
 .../mapper/system/FeatureLabelMapper.xml      |   8 +-
 .../mapper/system/FollowUpMapper.xml          |   8 +-
 .../mapper/system/GlobalAttachmentMapper.xml  |   8 +-
 .../mapper/system/GroupWechatMapper.xml       |   8 +-
 .../resources/mapper/system/MessageMapper.xml |   8 +-
 .../resources/mapper/system/ShAreaMapper.xml  |   8 +-
 .../mapper/system/SysConfigMapper.xml         |  10 +-
 .../resources/mapper/system/SysDeptMapper.xml |   8 +-
 .../mapper/system/SysDictDataMapper.xml       |  10 +-
 .../mapper/system/SysDictTypeMapper.xml       |   8 +-
 .../mapper/system/SysLogininforMapper.xml     |   6 +-
 .../resources/mapper/system/SysMenuMapper.xml |  12 +-
 .../mapper/system/SysNoticeMapper.xml         |   8 +-
 .../mapper/system/SysOperLogMapper.xml        |   6 +-
 .../resources/mapper/system/SysPostMapper.xml |   8 +-
 .../mapper/system/SysRoleDeptMapper.xml       |   2 +-
 .../resources/mapper/system/SysRoleMapper.xml |   8 +-
 .../mapper/system/SysRoleMenuMapper.xml       |   2 +-
 .../resources/mapper/system/SysUserMapper.xml |  24 +--
 .../mapper/system/SysUserPostMapper.xml       |   2 +-
 .../mapper/system/SysUserRoleMapper.xml       |   4 +-
 .../mapper/system/TeamMembersMapper.xml       |   6 +-
 .../mapper/system/TokenInfoMapper.xml         |   8 +-
 .../mapper/system/TrainingInfoMapper.xml      |   8 +-
 .../mapper/system/UserBuildingRelMapper.xml   |   8 +-
 .../mapper/system/UserRoleMapper.xml          |   8 +-
 .../mapper/system/UserWxAqrCodeMapper.xml     |   8 +-
 .../mapper/system/WxBasketballTeamMapper.xml  |   8 +-
 .../mapper/system/WxBuildingInfoMapper.xml    |   8 +-
 .../resources/mapper/system/WxUserMapper.xml  |   8 +-
 .../src/main/resources/bootstrap.yml          |   6 +-
 162 files changed, 464 insertions(+), 554 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6b31088..7ca46a6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,11 +192,11 @@
                 <artifactId>hutool-all</artifactId>
                 <version>5.7.12</version>
             </dependency>
-<!--            <dependency>
+            <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>3.5.3.1</version>
-            </dependency>-->
+                <version>3.5.3.2</version>
+            </dependency>
             <dependency>
                 <groupId>com.xuxueli</groupId>
                 <artifactId>xxl-job-core</artifactId>
@@ -247,11 +247,11 @@
                 <version>${ruoyi.version}</version>
             </dependency>
             <!-- mybatis-flex -->
-            <dependency>
+<!--            <dependency>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-spring-boot-starter</artifactId>
                 <version>${mybatis-flex.version}</version>
-            </dependency>
+            </dependency>-->
             <!-- 多数据源 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index bcf477c1..3d753b30 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -116,11 +116,16 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-        <!-- mybatis-flex -->
+        <!-- mybatis-plus-->
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- mybatis-flex -->
+    <!--    <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- Swagger -->
         <dependency>
             <groupId>io.swagger</groupId>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
index 79aee389..ea829712 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
@@ -1,11 +1,12 @@
 package com.ruoyi.common.core.web.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Column;
 
 /**
  * Entity基类
@@ -17,7 +18,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
-    @Column(ignore = true)
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -25,7 +26,6 @@ public class BaseEntity implements Serializable
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(onInsertValue = "now()")
     private Date createTime;
 
     /** 更新者 */
@@ -33,14 +33,13 @@ public class BaseEntity implements Serializable
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(onUpdateValue = "now()", onInsertValue = "now()")
     private Date updateTime;
 
     /** 备注 */
     private String remark;
 
     /** 请求参数 */
-    @Column(ignore = true)
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 605d3884..6cfc8b5a 100644
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -34,9 +34,13 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
         <!-- mybatis-flex -->
-        <dependency>
+   <!--     <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index 082527a4..e1ddc092 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -82,10 +82,10 @@
             <artifactId>lombok</artifactId>
         </dependency>
         <!-- mybatis-flex -->
-        <dependency>
+   <!--     <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
index d08b7325..b7367b53 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -1,18 +1,21 @@
 package com.ruoyi.gen.domain;
 
-import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 业务表 gen_table
  * 
  * @author ruoyi
  */
+@TableName("gen_table")
 public class GenTable extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
index 2f3e99df..86daba21 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -1,15 +1,18 @@
 package com.ruoyi.gen.domain;
 
-import javax.validation.constraints.NotBlank;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 代码生成业务字段表 gen_table_column
  * 
  * @author ruoyi
  */
+@TableName("gen_table_column")
 public class GenTableColumn extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 83565467..ef0e1868 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableColumnMapper">
     
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+    <resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
     </sql>
 	
-    <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="selectGenTableColumnListByTableId" parameterType="com.ruoyi.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id = #{tableId}
         order by sort
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by ordinal_position
 	</select>
     
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+    <insert id="insertGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
 	 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+    <update id="updateGenTableColumn" parameterType="com.ruoyi.gen.domain.GenTableColumn">
         update gen_table_column
         <set>
             column_comment = #{columnComment},
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
index f93a32bb..69d197e0 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.gen.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
+	<resultMap type="com.ruoyi.gen.domain.GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />
 		<result property="tableName"      column="table_name"        />
 		<result property="tableComment"   column="table_comment"     />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
 	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+	<resultMap type="com.ruoyi.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
     
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
+    <select id="selectGenTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+	<select id="selectDbTableList" parameterType="com.ruoyi.gen.domain.GenTable" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by c.sort
 	</select>
 	
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+	<insert id="insertGenTable" parameterType="com.ruoyi.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
     
-    <update id="updateGenTable" parameterType="GenTable">
+    <update id="updateGenTable" parameterType="com.ruoyi.gen.domain.GenTable">
         update gen_table
         <set>
             <if test="tableName != null">table_name = #{tableName},</if>
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
index cf8995ca..6bfada9b 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
@@ -6,7 +6,7 @@ import ${import};
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.web.domain.BaseEntity;
@@ -26,7 +26,7 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 #set($Entity="TreeEntity")
 #end
 @Data
-@Table("${tableName}")
+@TableName("${tableName}")
 public class ${ClassName} extends ${Entity}
 {
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm
index 6f031790..dd6405a0 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm
@@ -2,6 +2,7 @@ package ${packageName}.mapper;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
 #end
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
 {
     /**
      * 查询${functionName}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
index 42b57e4d..cdd8db61 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
@@ -2,7 +2,7 @@ package ${packageName}.service;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * ${functionName}Service接口
  * 
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
index 5aa48665..6dce9288 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 #end
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 #if($table.sub)
 import java.util.ArrayList;
 import com.ruoyi.common.core.utils.StringUtils;
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
index 5b704e73..0433e3cd 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
@@ -4,18 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
     
-    <resultMap type="${ClassName}" id="${ClassName}Result">
+    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
         <result property="${column.javaField}"    column="${column.columnName}"    />
 #end
     </resultMap>
 #if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+    <resultMap id="${ClassName}${subClassName}Result" type="${packageName}.domain.${ClassName}" extends="${ClassName}Result">
         <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
     </resultMap>
 
-    <resultMap type="${subClassName}" id="${subClassName}Result">
+    <resultMap type="${packageName}.domain.${subClassName}" id="${subClassName}Result">
 #foreach ($column in $subTable.columns)
         <result property="${column.javaField}"    column="sub_${column.columnName}"    />
 #end
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
 
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
         <where>  
 #foreach($column in $columns)
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
     </select>
         
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+    <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update${ClassName}" parameterType="${ClassName}">
+    <update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
         update ${tableName}
         <trim prefix="SET" suffixOverrides=",">
 #foreach($column in $columns)
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index d6660b52..4e03e587 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -59,11 +59,16 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-datasource</artifactId>
         </dependency>
-        <!-- mybatis-flex -->
+       <!-- mybatis-plus-->
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- mybatis-flex -->
+  <!--      <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- RuoYi Common DataScope -->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -109,7 +114,7 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
@@ -127,7 +132,7 @@
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java
index 24fd442b..4f2d4ff0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.*;
@@ -19,12 +21,12 @@ import java.util.Date;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Table("building_info_detail")
+@TableName("building_info_detail")
 public class BuildingInfoDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java
index ae3955f1..87bc99f7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("building_label")
+@TableName("building_label")
 public class BuildingLabel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java
index 4086b569..787758ee 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java
@@ -1,13 +1,12 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 building_team_rel
@@ -16,12 +15,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2023-07-04
  */
 @Data
-@Table("building_team_rel")
+@TableName("building_team_rel")
 public class BuildingTeamRel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java
index c7685712..e05201f4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("camera_info")
+@TableName("camera_info")
 public class CameraInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java
index 55fc0ab8..597b8860 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java
@@ -1,12 +1,13 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -22,12 +23,12 @@ import java.util.Date;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Table("competition")
+@TableName("competition")
 public class Competition extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 主队ID */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
index b8aa5644..953a9a14 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -16,12 +18,12 @@ import java.util.Date;
  * @date 2022-11-03
  */
 @Data
-@Table("competition_members")
+@TableName("competition_members")
 public class CompetitionMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 用户ID */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java
index 43eec126..5059668d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,12 +18,12 @@ import java.util.Date;
  * @date 2022-11-03
  */
 @Data
-@Table("competition_members_score")
+@TableName("competition_members_score")
 public class CompetitionMembersScore extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
index cf33a16e..4a5c7754 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -15,12 +17,12 @@ import java.util.Date;
  * @date 2022-11-03
  */
 @Data
-@Table("competition_of_team")
+@TableName("competition_of_team")
 public class CompetitionOfTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java
index c663f4e7..4d3ff4b4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java
@@ -1,9 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,13 +18,13 @@ import java.util.Date;
  * @date 2022-11-03
  */
 @Data
-@Table("competition_result")
+@TableName("competition_result")
 public class CompetitionResult extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Id(keyType = KeyType.Auto)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java
index a556abe2..78c5565d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -12,12 +14,13 @@ import lombok.Data;
  * @date 2023-07-20
  */
 @Data
-@Table("competition_share_permissions")
+@TableName("competition_share_permissions")
 public class CompetitionSharePermissions extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java
index 623425f4..a852267d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.*;
@@ -20,12 +22,13 @@ import java.util.Date;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Table("competition_team_group")
+@TableName("competition_team_group")
 public class CompetitionTeamGroup extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java
index 89547ac7..c9ccd2ef 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -15,12 +17,12 @@ import java.util.Date;
  * @date 2022-11-03
  */
 @Data
-@Table("competition_team_vs_team")
+@TableName("competition_team_vs_team")
 public class CompetitionTeamVsTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 赛事id(competition的ID) */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java
index 2d68c8b3..0c0e5077 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-06
  */
 @Data
-@Table("feature_label")
+@TableName("feature_label")
 public class FeatureLabel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java
index 30735152..4ed1c947 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FollowUp.java
@@ -1,15 +1,14 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 跟进模块-客户跟进记录对象 f_follow_up
@@ -18,13 +17,13 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @date 2023-05-07
  */
 @Data
-@Table("f_follow_up")
+@TableName("f_follow_up")
 public class FollowUp extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Id(keyType = KeyType.Auto)
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /** 客户id */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java
index cf1dd926..0bd1d2cb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("global_attachment")
+@TableName("global_attachment")
 public class GlobalAttachment extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 单据类型 */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java
index fc4a79bf..8edb06ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("group_wechat")
+@TableName("group_wechat")
 public class GroupWechat extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java
index b9788faa..7293c9fe 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java
@@ -1,12 +1,12 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
@@ -17,12 +17,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("message")
+@TableName("message")
 public class Message extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
@@ -78,150 +78,4 @@ public class Message extends BaseEntity
     @Excel(name = "流程参数【json】")
     private String flowEntity;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setIsDeleted(Integer isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setMessageTitle(String messageTitle) 
-    {
-        this.messageTitle = messageTitle;
-    }
-
-    public String getMessageTitle() 
-    {
-        return messageTitle;
-    }
-    public void setMessageType(String messageType) 
-    {
-        this.messageType = messageType;
-    }
-
-    public String getMessageType() 
-    {
-        return messageType;
-    }
-    public void setFlowType(String flowType) 
-    {
-        this.flowType = flowType;
-    }
-
-    public String getFlowType() 
-    {
-        return flowType;
-    }
-    public void setAuditor(Long auditor) 
-    {
-        this.auditor = auditor;
-    }
-
-    public Long getAuditor() 
-    {
-        return auditor;
-    }
-    public void setAuditDate(Date auditDate) 
-    {
-        this.auditDate = auditDate;
-    }
-
-    public Date getAuditDate() 
-    {
-        return auditDate;
-    }
-    public void setSourceId(Long sourceId) 
-    {
-        this.sourceId = sourceId;
-    }
-
-    public Long getSourceId() 
-    {
-        return sourceId;
-    }
-    public void setAgreeFlag(Integer agreeFlag) 
-    {
-        this.agreeFlag = agreeFlag;
-    }
-
-    public Integer getAgreeFlag() 
-    {
-        return agreeFlag;
-    }
-    public void setFlowEntity(String flowEntity) 
-    {
-        this.flowEntity = flowEntity;
-    }
-
-    public String getFlowEntity() 
-    {
-        return flowEntity;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("createdBy", getCreatedBy())
-            .append("createdTime", getCreatedTime())
-            .append("modifiedBy", getModifiedBy())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("isDeleted", getIsDeleted())
-            .append("messageTitle", getMessageTitle())
-            .append("messageType", getMessageType())
-            .append("flowType", getFlowType())
-            .append("auditor", getAuditor())
-            .append("auditDate", getAuditDate())
-            .append("sourceId", getSourceId())
-            .append("agreeFlag", getAgreeFlag())
-            .append("flowEntity", getFlowEntity())
-            .toString();
-    }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java
index 5e0a8b90..e4e49c80 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.*;
@@ -20,12 +22,12 @@ import java.util.Date;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Table("team_members")
+@TableName("team_members")
 public class TeamMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 球队ID */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java
index 1a1edfa6..fcaa8fda 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("training_info")
+@TableName("training_info")
 public class TrainingInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java
index 0cb44e2e..694cdd96 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -14,12 +16,12 @@ import java.util.Date;
  * @date 2023-07-04
  */
 @Data
-@Table("user_building_rel")
+@TableName("user_building_rel")
 public class UserBuildingRel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** $column.columnComment */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java
index 255bde22..69eb1805 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
-import com.mybatisflex.annotation.Table;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.*;
@@ -19,12 +21,12 @@ import java.util.Date;
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Table("user_role")
+@TableName("user_role")
 public class UserRole extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 用户id */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
index 31361435..72c9b176 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -15,12 +17,12 @@ import java.util.Date;
  * @date 2022-10-20
  */
 @Data
-@Table("user_wx_aqr_code")
+@TableName("user_wx_aqr_code")
 public class UserWxAqrCode extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除表示 */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java
index 0031612a..44dfa22a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBasketballTeam.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -15,13 +17,14 @@ import java.util.Date;
  * @date 2022-08-30
  */
 @Data
-@Table("basketball_team")
+@TableName("basketball_team")
 public class WxBasketballTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** ID */
     @Excel(name = "ID")
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java
index 73c335c1..5e7826a1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -16,12 +18,12 @@ import java.util.Date;
  * @date 2022-08-30
  */
 @Data
-@Table("building_info")
+@TableName("building_info")
 public class WxBuildingInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java
index c6e27b6b..1b2a448f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Table;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
@@ -16,12 +18,12 @@ import java.util.Date;
  * @date 2022-08-30
  */
 @Data
-@Table("user_info")
+@TableName("user_info")
 public class WxUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 删除 */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java
index fe7d3043..c2f21be3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingInfoDetail;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java
index 866fe066..a6308e1a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingLabelMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingLabel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java
index ef637acd..bc3fc82f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingTeamRelMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.BuildingTeamRel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java
index 0f46bf24..2541e5c9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CameraInfoMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CameraInfo;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java
index 2aa0d51d..0e80f6a5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.Competition;
 import com.ruoyi.system.domain.vo.CompetitionExcleVo;
 import com.ruoyi.system.domain.vo.CompetitionVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
index 6805dc8a..5ca12da9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionMembers;
 import com.ruoyi.system.domain.vo.CompetitionMembersVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java
index 0d1da5c5..62f38a91 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionMembersScore;
 import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java
index 0475bf0f..17a95be5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionOfTeamMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionOfTeam;
 import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java
index 7b3950f3..d5839647 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.vo.CompetitionResultVo;
 import org.apache.ibatis.annotations.Param;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java
index 6905d00c..3cdfa1c3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionSharePermissionsMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java
index ff577215..2b2f08a8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamGroupMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionTeamGroup;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java
index d1f6a78d..38728daf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CompetitionTeamVsTeam;
 import com.ruoyi.system.domain.vo.CompetitionTeamIntegralVo;
 import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java
index 1d20e603..c6d7f487 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerOrderMapper.java
@@ -1,11 +1,11 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
-
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.CustomerOrder;
 import com.ruoyi.system.domain.vo.CustomerOrderVo;
 
+import java.util.List;
+
 /**
  * 客户-订车Mapper接口
  * 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java
index bd699db8..2d1df6a5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FeatureLabelMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.FeatureLabel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java
index b6c9400c..f22f8c12 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FollowUpMapper.java
@@ -1,10 +1,10 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
-
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.FollowUp;
 
+import java.util.List;
+
 /**
  * 跟进模块-客户跟进记录Mapper接口
  * 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java
index fa4f91f7..841f64e4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalAttachmentMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.GlobalAttachment;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java
index 4100e3fd..059bc2df 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupWechatMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.GroupWechat;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java
index a136f31e..d255f1af 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MessageMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.Message;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java
index 6e188908..3d5b368f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeamMembersMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TeamMembers;
 import com.ruoyi.system.domain.vo.TeamMembersResponse;
 import com.ruoyi.system.domain.vo.TeamMembersVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java
index 66165539..38abb026 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrainingInfoMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TrainingInfo;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java
index c536eeee..ebaf6232 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserBuildingRelMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserBuildingRel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java
index 58cb666c..2a7d3759 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRoleMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserRole;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java
index d611c12b..ed9864e5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWxAqrCodeMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.UserWxAqrCode;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java
index 4abdb953..74c2aeda 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBasketballTeamMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxBasketballTeam;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java
index 3ecd8c00..e80f6011 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxBuildingInfoMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxBuildingInfo;
 import com.ruoyi.system.domain.vo.BuildingInfoRequest;
 import com.ruoyi.system.domain.vo.BuildingInfoResponse;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java
index e79508e8..b08ed87d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import com.mybatisflex.core.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.WxUser;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java
index e85c80b4..d744ad47 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingInfoDetailService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingInfoDetail;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java
index e1390f74..62e165d5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingLabelService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingLabel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java
index 43024988..c85c6cdc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IBuildingTeamRelService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.BuildingTeamRel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java
index 1c218ae2..97fe41d9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICameraInfoService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CameraInfo;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java
index c4c619a1..d05843a8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionMembersScore;
 import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java
index 549ad299..abd07c9c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionMembers;
 import com.ruoyi.system.domain.vo.CompetitionMembersVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java
index 668a3c3f..f5af9279 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionOfTeamService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionOfTeam;
 import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java
index e091a415..aeabb79b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.vo.CompetitionResultVo;
 import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java
index fe09055b..d50a1ac3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
 import com.ruoyi.system.domain.Competition;
 import com.ruoyi.system.domain.vo.CompetitionExcleVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java
index 18afe6de..16ed03c9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionSharePermissionsService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java
index 978f9a27..f03415ac 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamGroupService.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
 import com.ruoyi.system.domain.CompetitionTeamGroup;
 import com.ruoyi.system.domain.vo.TeamGroupRequest;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
index 0ebfca7c..b1cf1d25 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.CompetitionTeamVsTeam;
 import com.ruoyi.system.domain.vo.*;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java
index b4f7e77d..54fc2bb7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerOrderService.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.CustomerOrder;
 import com.ruoyi.system.domain.vo.CustomerOrderVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java
index 8ab9f6dd..65bd642d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFeatureLabelService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.FeatureLabel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java
index a86d6ac7..abc739f2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IFollowUpService.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.FollowUp;
 
 /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java
index ff47950b..7c62ec61 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalAttachmentService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.GlobalAttachment;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java
index c5df2db7..1fdd960e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IGroupWechatService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.GroupWechat;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java
index 0b81cb44..5971cde7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMessageService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.Message;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java
index a05a2cd1..30c0176d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITeamMembersService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.TeamMembers;
 import com.ruoyi.system.domain.vo.TeamMembersResponse;
 import com.ruoyi.system.domain.vo.TeamMembersVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java
index d4aadc6e..239d0645 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ITrainingInfoService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.TrainingInfo;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java
index 485c57c5..ce2e1a94 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserBuildingRelService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.UserBuildingRel;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java
index f3f6ffe8..c2d0063e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserRoleService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.UserRole;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java
index ecd50314..15e3c8ed 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWxAqrCodeService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.UserWxAqrCode;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java
index c2811608..ac8975f0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBasketballTeamService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.WxBasketballTeam;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java
index 2886309a..be62c4ae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxBuildingInfoService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.WxBuildingInfo;
 import com.ruoyi.system.domain.vo.BuildingInfoRequest;
 import com.ruoyi.system.domain.vo.BuildingInfoResponse;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java
index 5db3a0ac..81519d97 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.mybatisflex.core.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.WxUser;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java
index d3709f91..b19bdadf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingInfoDetailServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.BuildingInfoDetail;
 import com.ruoyi.system.mapper.BuildingInfoDetailMapper;
 import com.ruoyi.system.service.IBuildingInfoDetailService;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2023-07-06
  */
 @Service
-public class BuildingInfoDetailServiceImpl extends ServiceImpl<BuildingInfoDetailMapper, BuildingInfoDetail>  implements IBuildingInfoDetailService
+public class BuildingInfoDetailServiceImpl extends ServiceImpl<BuildingInfoDetailMapper, BuildingInfoDetail> implements IBuildingInfoDetailService
 {
     @Autowired
     private BuildingInfoDetailMapper buildingInfoDetailMapper;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java
index 4c8e04e8..4b58a01c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingLabelServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.BuildingLabel;
 import com.ruoyi.system.mapper.BuildingLabelMapper;
 import com.ruoyi.system.service.IBuildingLabelService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java
index 3586573c..43395cb5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuildingTeamRelServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.BuildingTeamRel;
 import com.ruoyi.system.mapper.BuildingTeamRelMapper;
 import com.ruoyi.system.service.IBuildingTeamRelService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java
index 970e9eb1..98ff3aa0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CameraInfoServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.CameraInfo;
 import com.ruoyi.system.mapper.CameraInfoMapper;
 import com.ruoyi.system.service.ICameraInfoService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java
index 88109dd5..5ac534e0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.CompetitionMembersScore;
 import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 import com.ruoyi.system.mapper.CompetitionMembersScoreMapper;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java
index 7625cb67..99ea19a7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.Competition;
 import com.ruoyi.system.domain.CompetitionMembers;
 import com.ruoyi.system.domain.CompetitionOfTeam;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
index dfd554e8..40f0f3ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.CompetitionOfTeam;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
index 5ee835ac..855e3360 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.CompetitionResult;
 import com.ruoyi.system.domain.CompetitionTeamVsTeam;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
index 1e7d7b73..9c8edf80 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
@@ -13,7 +13,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson.JSON;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.exception.CheckedException;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java
index b844e3ad..9fe4ae74 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionSharePermissionsServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.exception.CheckedException;
 import com.ruoyi.system.domain.CompetitionSharePermissions;
 import com.ruoyi.system.mapper.CompetitionSharePermissionsMapper;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java
index eae38be6..97683ca9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.redis.service.RedisService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
index 0d34ce72..72478314 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
@@ -1,8 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
@@ -13,6 +12,8 @@ import com.ruoyi.system.domain.vo.*;
 import com.ruoyi.system.mapper.CompetitionMembersScoreMapper;
 import com.ruoyi.system.mapper.CompetitionResultMapper;
 import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper;
+import com.ruoyi.system.service.ICompetitionMembersScoreService;
+import com.ruoyi.system.service.ICompetitionResultService;
 import com.ruoyi.system.service.ICompetitionTeamVsTeamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,9 +25,6 @@ import java.security.InvalidParameterException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.ruoyi.system.domain.table.CompetitionMembersScoreTableDef.COMPETITION_MEMBERS_SCORE;
-import static com.ruoyi.system.domain.table.CompetitionResultTableDef.COMPETITION_RESULT;
-
 /**
  * 赛会中-球队VS球队关系Service业务层处理
  * 
@@ -42,8 +40,11 @@ public class CompetitionTeamVsTeamServiceImpl extends ServiceImpl<CompetitionTea
     @Resource
     private CompetitionResultMapper competitionResultMapper;
     @Resource
+    private ICompetitionResultService competitionResultService;
+    @Resource
     private CompetitionMembersScoreMapper competitionMembersScoreMapper;
-
+    @Resource
+    private ICompetitionMembersScoreService competitionMembersScoreService;
     /**
      * 查询赛会中-球队VS球队关系
      * 
@@ -103,12 +104,8 @@ public class CompetitionTeamVsTeamServiceImpl extends ServiceImpl<CompetitionTea
     public int deleteCompetitionTeamVsTeamByIds(Long[] ids)
     {
         //删除赛程的时候同时删除比赛结果
-        QueryWrapper queryWrapper = QueryWrapper.create();
-        queryWrapper.where(COMPETITION_RESULT.COMPETITION_VS_ID.in(ids));
-        competitionResultMapper.deleteByQuery(queryWrapper);
-        QueryWrapper queryWrapper1 = QueryWrapper.create();
-        queryWrapper1.where(COMPETITION_MEMBERS_SCORE.COMPETITION_VS_ID.in(ids));
-        competitionMembersScoreMapper.deleteByQuery(queryWrapper1);
+        competitionResultService.lambdaUpdate().in(CompetitionResult::getCompetitionVsId,ids).remove();
+        competitionMembersScoreService.lambdaUpdate().in(CompetitionMembersScore::getCompetitionVsId,ids).remove();
         return competitionTeamVsTeamMapper.deleteCompetitionTeamVsTeamByIds(ids);
     }
 
@@ -323,12 +320,8 @@ public class CompetitionTeamVsTeamServiceImpl extends ServiceImpl<CompetitionTea
     public Boolean deleteBatchByIds(Ids ids) {
         Long[]  idList = ids.getIdList().stream().toArray(Long[]::new);
         //删除赛程的时候同时删除比赛结果
-        QueryWrapper queryWrapper = QueryWrapper.create();
-        queryWrapper.where(COMPETITION_RESULT.COMPETITION_VS_ID.in(idList));
-        competitionResultMapper.deleteByQuery(queryWrapper);
-        QueryWrapper queryWrapper1 = QueryWrapper.create();
-        queryWrapper1.where(COMPETITION_MEMBERS_SCORE.COMPETITION_VS_ID.in(idList));
-        competitionMembersScoreMapper.deleteByQuery(queryWrapper1);
+        competitionResultService.lambdaUpdate().in(CompetitionResult::getCompetitionVsId,ids).remove();
+        competitionMembersScoreService.lambdaUpdate().in(CompetitionMembersScore::getCompetitionVsId,ids).remove();
         competitionTeamVsTeamMapper.deleteCompetitionTeamVsTeamByIds(idList);
         return Boolean.TRUE;
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java
index 4a2338cd..3edfd06b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerOrderServiceImpl.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.system.domain.vo.CustomerOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java
index dc30f2aa..40256ef6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FeatureLabelServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.FeatureLabel;
 import com.ruoyi.system.mapper.FeatureLabelMapper;
 import com.ruoyi.system.service.IFeatureLabelService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java
index 75a4b0e2..b85f8a4c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FollowUpServiceImpl.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.system.domain.Customer;
 import com.ruoyi.system.mapper.CustomerMapper;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java
index b0a039fd..df8a0d00 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalAttachmentServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.GlobalAttachment;
 import com.ruoyi.system.mapper.GlobalAttachmentMapper;
 import com.ruoyi.system.service.IGlobalAttachmentService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java
index fef2f964..2d6d8386 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupWechatServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.GroupWechat;
 import com.ruoyi.system.mapper.GroupWechatMapper;
 import com.ruoyi.system.service.IGroupWechatService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java
index 3bdfcdbd..cdd78913 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MessageServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.Message;
 import com.ruoyi.system.mapper.MessageMapper;
 import com.ruoyi.system.service.IMessageService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java
index 6cf58a26..d8c7b8bc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TeamMembersServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.TeamMembers;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java
index 3f05affc..28339c83 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrainingInfoServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.TrainingInfo;
 import com.ruoyi.system.mapper.TrainingInfoMapper;
 import com.ruoyi.system.service.ITrainingInfoService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java
index 5435b08b..5250df72 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserBuildingRelServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.UserBuildingRel;
 import com.ruoyi.system.mapper.UserBuildingRelMapper;
 import com.ruoyi.system.service.IUserBuildingRelService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java
index baa94a37..d3f49025 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserRoleServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.UserRole;
 import com.ruoyi.system.mapper.UserRoleMapper;
 import com.ruoyi.system.service.IUserRoleService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
index 87ad43fa..66b094cb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java
index 3ebed76b..9066cda3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBasketballTeamServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.WxBasketballTeam;
 import com.ruoyi.system.mapper.WxBasketballTeamMapper;
 import com.ruoyi.system.service.IWxBasketballTeamService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
index 74eeab7a..6ac725fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.domain.BuildingInfoDetail;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java
index 56585df0..c0311696 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.WxUser;
 import com.ruoyi.system.mapper.WxUserMapper;
 import com.ruoyi.system.service.IWxUserService;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml
index dfb29a7b..d0d2c843 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BuildingTeamRelMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.BuildingTeamRelMapper">
     
-    <resultMap type="BuildingTeamRel" id="BuildingTeamRelResult">
+    <resultMap type="com.ruoyi.system.domain.BuildingTeamRel" id="BuildingTeamRelResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, BUILDING_ID, TEAM_ID from building_team_rel
     </sql>
 
-    <select id="selectBuildingTeamRelList" parameterType="BuildingTeamRel" resultMap="BuildingTeamRelResult">
+    <select id="selectBuildingTeamRelList" parameterType="com.ruoyi.system.domain.BuildingTeamRel" resultMap="BuildingTeamRelResult">
         <include refid="selectBuildingTeamRelVo"/>
         <where>  
             <if test="isDeleted != null  and isDeleted != ''"> and IS_DELETED = #{isDeleted}</if>
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertBuildingTeamRel" parameterType="BuildingTeamRel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertBuildingTeamRel" parameterType="com.ruoyi.system.domain.BuildingTeamRel" useGeneratedKeys="true" keyProperty="id">
         insert into building_team_rel
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateBuildingTeamRel" parameterType="BuildingTeamRel">
+    <update id="updateBuildingTeamRel" parameterType="com.ruoyi.system.domain.BuildingTeamRel">
         update building_team_rel
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml
index 59f47dfd..fb858cb8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CameraInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CameraInfoMapper">
     
-    <resultMap type="CameraInfo" id="CameraInfoResult">
+    <resultMap type="com.ruoyi.system.domain.CameraInfo" id="CameraInfoResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, STATUS, CITY_CODE, TYPE, NAME, SN, BUILDING_ID, REMARK, URL from camera_info
     </sql>
 
-    <select id="selectCameraInfoList" parameterType="CameraInfo" resultMap="CameraInfoResult">
+    <select id="selectCameraInfoList" parameterType="com.ruoyi.system.domain.CameraInfo" resultMap="CameraInfoResult">
         <include refid="selectCameraInfoVo"/>
         <where>  
             <if test="isDeleted != null "> and IS_DELETED = #{isDeleted}</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertCameraInfo" parameterType="CameraInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCameraInfo" parameterType="com.ruoyi.system.domain.CameraInfo" useGeneratedKeys="true" keyProperty="id">
         insert into camera_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCameraInfo" parameterType="CameraInfo">
+    <update id="updateCameraInfo" parameterType="com.ruoyi.system.domain.CameraInfo">
         update camera_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml
index f2101949..3be59e9a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionMapper">
     
-    <resultMap type="Competition" id="CompetitionResult">
+    <resultMap type="com.ruoyi.system.domain.Competition" id="CompetitionResult">
         <result property="id"    column="id"    />
         <result property="mainTeamId"    column="main_team_id"    />
         <result property="mainTeamName"    column="main_team_name"    />
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, main_team_id, main_team_name,order_id, guest_team_id, guest_team_name, competition_code, competition_name, designated, competition_type, competition_time, building_id, building_name, competition_address, founder, status, city_code, city_name, max_player, created_time, last_updated_time, created_by, modified_by, is_deleted, longitude, latitude, remark, competition_nature, enroll_begin_time, enroll_end_time, contacts, contacts_area_code, contacts_tel, competition_begin_time, competition_end_time, organizer, undertake, competition_back_img, created_id, audit_status, height_hide, sponsor from competition
     </sql>
 
-    <select id="selectCompetitionList" parameterType="Competition" resultMap="CompetitionResult">
+    <select id="selectCompetitionList" parameterType="com.ruoyi.system.domain.Competition" resultMap="CompetitionResult">
         <include refid="selectCompetitionVo"/>
         <where>  
             <if test="mainTeamId != null "> and main_team_id = #{mainTeamId}</if>
@@ -266,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <insert id="insertCompetition" parameterType="Competition" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetition" parameterType="com.ruoyi.system.domain.Competition" useGeneratedKeys="true" keyProperty="id">
         insert into competition
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="mainTeamId != null">main_team_id,</if>
@@ -356,7 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetition" parameterType="Competition">
+    <update id="updateCompetition" parameterType="com.ruoyi.system.domain.Competition">
         update competition
         <trim prefix="SET" suffixOverrides=",">
             <if test="mainTeamId != null">main_team_id = #{mainTeamId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
index 9016ffe0..d245d984 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionMembersMapper">
     
-    <resultMap type="CompetitionMembers" id="CompetitionMembersResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionMembers" id="CompetitionMembersResult">
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="roleCode"    column="role_code"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, user_id, role_code,is_hide_avatar, competition_id, competition_team_id, score, penalty, two_points, three_points, breaks, rebound, block, is_deleted, created_by, modified_by, created_time, last_updated_time, status, user_type, competition_of_team_id, competition_nature, real_name, jersey_number, id_type, id_card_no, contacts_tel, contacts, contacts_area_code, personal_photo, is_first_launch,team_position,height,weight from competition_members
     </sql>
 
-    <select id="selectCompetitionMembersList" parameterType="CompetitionMembers" resultMap="CompetitionMembersResult">
+    <select id="selectCompetitionMembersList" parameterType="com.ruoyi.system.domain.CompetitionMembers" resultMap="CompetitionMembersResult">
         <include refid="selectCompetitionMembersVo"/>
         <where>  
             <if test="userId != null "> and user_id = #{userId}</if>
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where c.competition_id = #{competitionId} AND  c.is_deleted = 0
     </select>
 
-    <insert id="insertCompetitionMembers" parameterType="CompetitionMembers" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionMembers" parameterType="com.ruoyi.system.domain.CompetitionMembers" useGeneratedKeys="true" keyProperty="id">
         insert into competition_members
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionMembers" parameterType="CompetitionMembers">
+    <update id="updateCompetitionMembers" parameterType="com.ruoyi.system.domain.CompetitionMembers">
         update competition_members
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
index 8dac6a0b..b3c18314 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionMembersScoreMapper">
     
-    <resultMap type="CompetitionMembersScore" id="CompetitionMembersScoreResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionMembersScore" id="CompetitionMembersScoreResult">
         <result property="id"    column="id"    />
         <result property="competitionId"    column="competition_id"    />
         <result property="competitionVsId"    column="competition_vs_id"    />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, competition_id, competition_vs_id, team_id, team_name, node_num, team_user_id, jersey_number, total_score, two_points, three_points, penalty, backboard, front_plate, back_plate, assists, snatch, block, fault, breaks, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, is_first_launch,competition_of_team_id,competition_members_id from competition_members_score
     </sql>
 
-    <select id="selectCompetitionMembersScoreList" parameterType="CompetitionMembersScore" resultMap="CompetitionMembersScoreResult">
+    <select id="selectCompetitionMembersScoreList" parameterType="com.ruoyi.system.domain.CompetitionMembersScore" resultMap="CompetitionMembersScoreResult">
         <include refid="selectCompetitionMembersScoreVo"/>
         <where>  
             <if test="competitionId != null "> and competition_id = #{competitionId}</if>
@@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND  score.competition_members_id = #{competitionMembersId}
         </if>
     </select>
-    <insert id="insertCompetitionMembersScore" parameterType="CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionMembersScore" parameterType="com.ruoyi.system.domain.CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id">
         insert into competition_members_score
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">competition_id,</if>
@@ -271,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionMembersScore" parameterType="CompetitionMembersScore">
+    <update id="updateCompetitionMembersScore" parameterType="com.ruoyi.system.domain.CompetitionMembersScore">
         update competition_members_score
         <trim prefix="SET" suffixOverrides=",">
             <if test="competitionId != null">competition_id = #{competitionId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
index ad615123..aeb30d2b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionOfTeamMapper">
     
-    <resultMap type="CompetitionOfTeam" id="CompetitionOfTeamResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionOfTeam" id="CompetitionOfTeamResult">
         <result property="id"    column="id"    />
         <result property="competitionId"    column="competition_id"    />
         <result property="teamId"    column="team_id"    />
@@ -212,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.created_time desc
     </select>
 
-    <insert id="insertCompetitionOfTeam" parameterType="CompetitionOfTeam" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionOfTeam" parameterType="com.ruoyi.system.domain.CompetitionOfTeam" useGeneratedKeys="true" keyProperty="id">
         insert into competition_of_team
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">competition_id,</if>
@@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionOfTeam" parameterType="CompetitionOfTeam">
+    <update id="updateCompetitionOfTeam" parameterType="com.ruoyi.system.domain.CompetitionOfTeam">
         update competition_of_team
         <trim prefix="SET" suffixOverrides=",">
             <if test="competitionId != null">competition_id = #{competitionId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml
index bbeac05d..a55eb6bb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionResultMapper">
     
-    <resultMap type="CompetitionResult" id="CompetitionResultResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionResult" id="CompetitionResultResult">
         <result property="id"    column="id"    />
         <result property="competitionId"    column="competition_id"    />
         <result property="competitionVsId"    column="competition_vs_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, competition_id, competition_vs_id,net_win_point, team_id, team_name, one_node_score, two_node_score, competition_group, status, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, three_node_score, four_node_score, five_node_score, six_node_score, integral,vs_result,competition_of_team_id,vs_result from competition_result
     </sql>
 
-    <select id="selectCompetitionResultList" parameterType="CompetitionResult" resultMap="CompetitionResultResult">
+    <select id="selectCompetitionResultList" parameterType="com.ruoyi.system.domain.CompetitionResult" resultMap="CompetitionResultResult">
         <include refid="selectCompetitionResultVo"/>
         <where>  
             <if test="competitionId != null "> and competition_id = #{competitionId}</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <insert id="insertCompetitionResult" parameterType="CompetitionResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionResult" parameterType="com.ruoyi.system.domain.CompetitionResult" useGeneratedKeys="true" keyProperty="id">
         insert into competition_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">competition_id,</if>
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionResult" parameterType="CompetitionResult">
+    <update id="updateCompetitionResult" parameterType="com.ruoyi.system.domain.CompetitionResult">
         update competition_result
         <trim prefix="SET" suffixOverrides=",">
             <if test="competitionId != null">competition_id = #{competitionId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
index 1dbd9cc7..57794c61 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionSharePermissionsMapper">
 
-    <resultMap type="CompetitionSharePermissions" id="CompetitionSharePermissionsResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionSharePermissions" id="CompetitionSharePermissionsResult">
         <result property="id"    column="id"    />
         <result property="createTime"    column="create_time"    />
         <result property="competitionId"    column="competition_id"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, create_time, competition_id, user_id, user_tel, user_name, status, update_time, create_by, update_by, is_deleted, remark, can_set_type from competition_share_permissions
     </sql>
 
-    <select id="selectCompetitionSharePermissionsList" parameterType="CompetitionSharePermissions" resultMap="CompetitionSharePermissionsResult">
+    <select id="selectCompetitionSharePermissionsList" parameterType="com.ruoyi.system.domain.CompetitionSharePermissions" resultMap="CompetitionSharePermissionsResult">
         <include refid="selectCompetitionSharePermissionsVo"/>
         <where>
             <if test="competitionId != null "> and competition_id = #{competitionId}</if>
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertCompetitionSharePermissions" parameterType="CompetitionSharePermissions" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionSharePermissions" parameterType="com.ruoyi.system.domain.CompetitionSharePermissions" useGeneratedKeys="true" keyProperty="id">
         insert into competition_share_permissions
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="createTime != null">create_time,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <update id="updateCompetitionSharePermissions" parameterType="CompetitionSharePermissions">
+    <update id="updateCompetitionSharePermissions" parameterType="com.ruoyi.system.domain.CompetitionSharePermissions">
         update competition_share_permissions
         <trim prefix="SET" suffixOverrides=",">
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml
index bb5b2b0b..07e5d8da 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamGroupMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionTeamGroupMapper">
     
-    <resultMap type="CompetitionTeamGroup" id="CompetitionTeamGroupResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionTeamGroup" id="CompetitionTeamGroupResult">
         <result property="id"    column="id"    />
         <result property="competitionId"    column="competition_id"    />
         <result property="competitionGroup"    column="competition_group"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, competition_id, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, is_cycle from competition_team_group
     </sql>
 
-    <select id="selectCompetitionTeamGroupList" parameterType="CompetitionTeamGroup" resultMap="CompetitionTeamGroupResult">
+    <select id="selectCompetitionTeamGroupList" parameterType="com.ruoyi.system.domain.CompetitionTeamGroup" resultMap="CompetitionTeamGroupResult">
         <include refid="selectCompetitionTeamGroupVo"/>
         <where>  
             <if test="competitionId != null "> and competition_id = #{competitionId}</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.created_time desc
     </select>
 
-    <insert id="insertCompetitionTeamGroup" parameterType="CompetitionTeamGroup" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionTeamGroup" parameterType="com.ruoyi.system.domain.CompetitionTeamGroup" useGeneratedKeys="true" keyProperty="id">
         insert into competition_team_group
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">competition_id,</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionTeamGroup" parameterType="CompetitionTeamGroup">
+    <update id="updateCompetitionTeamGroup" parameterType="com.ruoyi.system.domain.CompetitionTeamGroup">
         update competition_team_group
         <trim prefix="SET" suffixOverrides=",">
             <if test="competitionId != null">competition_id = #{competitionId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
index 45d7b3f4..ba580e10 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper">
     
-    <resultMap type="CompetitionTeamVsTeam" id="CompetitionTeamVsTeamResult">
+    <resultMap type="com.ruoyi.system.domain.CompetitionTeamVsTeam" id="CompetitionTeamVsTeamResult">
         <result property="id"    column="id"    />
         <result property="competitionId"    column="competition_id"    />
         <result property="mainTeamId"    column="main_team_id"    />
@@ -354,7 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.competition_time asc
     </select>
 
-    <insert id="insertCompetitionTeamVsTeam" parameterType="CompetitionTeamVsTeam" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCompetitionTeamVsTeam" parameterType="com.ruoyi.system.domain.CompetitionTeamVsTeam" useGeneratedKeys="true" keyProperty="id">
         insert into competition_team_vs_team
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">competition_id,</if>
@@ -404,7 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCompetitionTeamVsTeam" parameterType="CompetitionTeamVsTeam">
+    <update id="updateCompetitionTeamVsTeam" parameterType="com.ruoyi.system.domain.CompetitionTeamVsTeam">
         update competition_team_vs_team
         <trim prefix="SET" suffixOverrides=",">
             <if test="competitionId != null">competition_id = #{competitionId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml
index 276e5e7a..0cee7597 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CustomerMapper">
     
-    <resultMap type="Customer" id="CustomerResult">
+    <resultMap type="com.ruoyi.system.domain.Customer" id="CustomerResult">
         <result property="id"    column="id"    />
         <result property="userName"    column="user_name"    />
         <result property="nickName"    column="nick_name"    />
@@ -42,22 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderDate"    column="order_date"    />
     </resultMap>
 
-    <resultMap id="CustomerFollowUpResult" type="Customer" extends="CustomerResult">
+    <resultMap id="CustomerFollowUpResult" type="com.ruoyi.system.domain.Customer" extends="CustomerResult">
         <collection property="followUpList" notNullColumn="sub_id" javaType="java.util.List" resultMap="FollowUpResult" />
     </resultMap>
 
-    <resultMap type="FollowUp" id="FollowUpResult">
+    <resultMap type="com.ruoyi.system.domain.FollowUp" id="FollowUpResult">
         <result property="id"    column="sub_id"    />
         <result property="customerId"    column="sub_customer_id"    />
         <result property="followUpDate"    column="sub_follow_up_date"    />
         <result property="followUpRecord"    column="sub_follow_up_record"    />
-        <result property="preToStoreDate"    column="sub_pre_to_store_date"    />
         <result property="createBy"    column="sub_create_by"    />
         <result property="createTime"    column="sub_create_time"    />
         <result property="updateBy"    column="sub_update_by"    />
         <result property="updateTime"    column="sub_update_time"    />
         <result property="remark"    column="sub_remark"    />
-        <result property="followLevel"    column="sub_follow_level"    />
     </resultMap>
 
     <sql id="selectCustomerVo">
@@ -183,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-    <insert id="insertCustomer" parameterType="Customer" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCustomer" parameterType="com.ruoyi.system.domain.Customer" useGeneratedKeys="true" keyProperty="id">
         insert into f_customer
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userName != null and userName != ''">user_name,</if>
@@ -259,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCustomer" parameterType="Customer">
+    <update id="updateCustomer" parameterType="com.ruoyi.system.domain.Customer">
         update f_customer
         <trim prefix="SET" suffixOverrides=",">
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml
index 790499e5..40430643 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerOrderMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CustomerOrderMapper">
     
-    <resultMap type="CustomerOrder" id="CustomerOrderResult">
+    <resultMap type="com.ruoyi.system.domain.CustomerOrder" id="CustomerOrderResult">
         <result property="id"    column="id"    />
         <result property="customerId"    column="customer_id"    />
         <result property="orderDate"    column="order_date"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, customer_id, order_date, car_info, car_vin,out_date, car_status, create_by, create_time, update_by, update_time, remark from f_customer_order
     </sql>
 
-    <select id="selectCustomerOrderList" parameterType="CustomerOrder" resultMap="CustomerOrderResult">
+    <select id="selectCustomerOrderList" parameterType="com.ruoyi.system.domain.CustomerOrder" resultMap="CustomerOrderResult">
         <include refid="selectCustomerOrderVo"/>
         <where>  
             <if test="customerId != null "> and customer_id = #{customerId}</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="insertCustomerOrder" parameterType="CustomerOrder" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCustomerOrder" parameterType="com.ruoyi.system.domain.CustomerOrder" useGeneratedKeys="true" keyProperty="id">
         insert into f_customer_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="customerId != null">customer_id,</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateCustomerOrder" parameterType="CustomerOrder">
+    <update id="updateCustomerOrder" parameterType="com.ruoyi.system.domain.CustomerOrder">
         update f_customer_order
         <trim prefix="SET" suffixOverrides=",">
             <if test="customerId != null">customer_id = #{customerId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml
index 70defa78..43776399 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/DataDictionaryMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.DataDictionaryMapper">
     
-    <resultMap type="DataDictionary" id="DataDictionaryResult">
+    <resultMap type="com.ruoyi.system.domain.DataDictionary" id="DataDictionaryResult">
         <result property="id"    column="ID"    />
         <result property="createdBy"    column="CREATED_BY"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, CREATED_BY, CREATED_TIME, MODIFIED_BY, LAST_UPDATED_TIME, IS_DELETED, KEY, NAME, ENABLED, PARENT_ID, SORT_NUMBER from data_dictionary
     </sql>
 
-    <select id="selectDataDictionaryList" parameterType="DataDictionary" resultMap="DataDictionaryResult">
+    <select id="selectDataDictionaryList" parameterType="com.ruoyi.system.domain.DataDictionary" resultMap="DataDictionaryResult">
         <include refid="selectDataDictionaryVo"/>
         <where>  
             <if test="createdBy != null  and createdBy != ''"> and CREATED_BY = #{createdBy}</if>
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
 
-    <insert id="insertDataDictionary" parameterType="DataDictionary" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDataDictionary" parameterType="com.ruoyi.system.domain.DataDictionary" useGeneratedKeys="true" keyProperty="id">
         insert into data_dictionary
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="createdBy != null">CREATED_BY,</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateDataDictionary" parameterType="DataDictionary">
+    <update id="updateDataDictionary" parameterType="com.ruoyi.system.domain.DataDictionary">
         update data_dictionary
         <trim prefix="SET" suffixOverrides=",">
             <if test="createdBy != null">CREATED_BY = #{createdBy},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml
index 38135d09..c2c6cad3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FeatureLabelMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.FeatureLabelMapper">
     
-    <resultMap type="FeatureLabel" id="FeatureLabelResult">
+    <resultMap type="com.ruoyi.system.domain.FeatureLabel" id="FeatureLabelResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, DESCRIPTION, REMARK, BUILDING_ID from feature_label
     </sql>
 
-    <select id="selectFeatureLabelList" parameterType="FeatureLabel" resultMap="FeatureLabelResult">
+    <select id="selectFeatureLabelList" parameterType="com.ruoyi.system.domain.FeatureLabel" resultMap="FeatureLabelResult">
         <include refid="selectFeatureLabelVo"/>
         <where>  
             <if test="isDeleted != null "> and IS_DELETED = #{isDeleted}</if>
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertFeatureLabel" parameterType="FeatureLabel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFeatureLabel" parameterType="com.ruoyi.system.domain.FeatureLabel" useGeneratedKeys="true" keyProperty="id">
         insert into feature_label
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateFeatureLabel" parameterType="FeatureLabel">
+    <update id="updateFeatureLabel" parameterType="com.ruoyi.system.domain.FeatureLabel">
         update feature_label
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml
index 54e82fa7..127c8789 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FollowUpMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.FollowUpMapper">
 
-    <resultMap type="FollowUp" id="FollowUpResult">
+    <resultMap type="com.ruoyi.system.domain.FollowUp" id="FollowUpResult">
         <result property="id"    column="id"    />
         <result property="customerId"    column="customer_id"    />
         <result property="followUpDate"    column="follow_up_date"    />
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, customer_id,objective,follow_type,maker_status,arrival_time, follow_up_date, follow_up_method, follow_result, intention_level, follow_up_record, next_follow_up_record, next_follow_up_time, appointment_time, create_by, create_time, update_by, update_time, remark, defeat_reasons from f_follow_up
     </sql>
 
-    <select id="selectFollowUpList" parameterType="FollowUp" resultMap="FollowUpResult">
+    <select id="selectFollowUpList" parameterType="com.ruoyi.system.domain.FollowUp" resultMap="FollowUpResult">
         <include refid="selectFollowUpVo"/>
         <where>
             <if test="customerId != null "> and customer_id = #{customerId}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertFollowUp" parameterType="FollowUp" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFollowUp" parameterType="com.ruoyi.system.domain.FollowUp" useGeneratedKeys="true" keyProperty="id">
         insert into f_follow_up
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="customerId != null">customer_id,</if>
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <update id="updateFollowUp" parameterType="FollowUp">
+    <update id="updateFollowUp" parameterType="com.ruoyi.system.domain.FollowUp">
         update f_follow_up
         <trim prefix="SET" suffixOverrides=",">
             <if test="customerId != null">customer_id = #{customerId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml
index 58329e2d..1d394638 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GlobalAttachmentMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.GlobalAttachmentMapper">
     
-    <resultMap type="GlobalAttachment" id="GlobalAttachmentResult">
+    <resultMap type="com.ruoyi.system.domain.GlobalAttachment" id="GlobalAttachmentResult">
         <result property="id"    column="ID"    />
         <result property="bizType"    column="BIZ_TYPE"    />
         <result property="bizId"    column="BIZ_ID"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, BIZ_TYPE, BIZ_ID, ATTACHMENT_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL, VERSION, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, consult_type from global_attachment
     </sql>
 
-    <select id="selectGlobalAttachmentList" parameterType="GlobalAttachment" resultMap="GlobalAttachmentResult">
+    <select id="selectGlobalAttachmentList" parameterType="com.ruoyi.system.domain.GlobalAttachment" resultMap="GlobalAttachmentResult">
         <include refid="selectGlobalAttachmentVo"/>
         <where>  
             <if test="bizType != null  and bizType != ''"> and BIZ_TYPE = #{bizType}</if>
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertGlobalAttachment" parameterType="GlobalAttachment" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertGlobalAttachment" parameterType="com.ruoyi.system.domain.GlobalAttachment" useGeneratedKeys="true" keyProperty="id">
         insert into global_attachment
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bizType != null">BIZ_TYPE,</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateGlobalAttachment" parameterType="GlobalAttachment">
+    <update id="updateGlobalAttachment" parameterType="com.ruoyi.system.domain.GlobalAttachment">
         update global_attachment
         <trim prefix="SET" suffixOverrides=",">
             <if test="bizType != null">BIZ_TYPE = #{bizType},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml
index 0e143ac6..eb6df182 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/GroupWechatMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.GroupWechatMapper">
     
-    <resultMap type="GroupWechat" id="GroupWechatResult">
+    <resultMap type="com.ruoyi.system.domain.GroupWechat" id="GroupWechatResult">
         <result property="id"    column="ID"    />
         <result property="buildingId"    column="BUILDING_ID"    />
         <result property="groupName"    column="GROUP_NAME"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, BUILDING_ID, GROUP_NAME, HEADER_PICTURE, GROUP_CODE, SCAN_NUM, SERVICE_USER, SERVICE_USER_QRCODE, REMARKS, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME from group_wechat
     </sql>
 
-    <select id="selectGroupWechatList" parameterType="GroupWechat" resultMap="GroupWechatResult">
+    <select id="selectGroupWechatList" parameterType="com.ruoyi.system.domain.GroupWechat" resultMap="GroupWechatResult">
         <include refid="selectGroupWechatVo"/>
         <where>  
             <if test="buildingId != null "> and BUILDING_ID = #{buildingId}</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertGroupWechat" parameterType="GroupWechat" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertGroupWechat" parameterType="com.ruoyi.system.domain.GroupWechat" useGeneratedKeys="true" keyProperty="id">
         insert into group_wechat
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="buildingId != null">BUILDING_ID,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateGroupWechat" parameterType="GroupWechat">
+    <update id="updateGroupWechat" parameterType="com.ruoyi.system.domain.GroupWechat">
         update group_wechat
         <trim prefix="SET" suffixOverrides=",">
             <if test="buildingId != null">BUILDING_ID = #{buildingId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml
index c9c81383..09a7936c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MessageMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.MessageMapper">
     
-    <resultMap type="Message" id="MessageResult">
+    <resultMap type="com.ruoyi.system.domain.Message" id="MessageResult">
         <result property="id"    column="ID"    />
         <result property="createdBy"    column="CREATED_BY"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, CREATED_BY, CREATED_TIME, MODIFIED_BY, LAST_UPDATED_TIME, IS_DELETED, MESSAGE_TITLE, MESSAGE_TYPE, FLOW_TYPE, AUDITOR, AUDIT_DATE, SOURCE_ID, AGREE_FLAG, FLOW_ENTITY from message
     </sql>
 
-    <select id="selectMessageList" parameterType="Message" resultMap="MessageResult">
+    <select id="selectMessageList" parameterType="com.ruoyi.system.domain.Message" resultMap="MessageResult">
         <include refid="selectMessageVo"/>
         <where>  
             <if test="createdBy != null  and createdBy != ''"> and CREATED_BY = #{createdBy}</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertMessage" parameterType="Message" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMessage" parameterType="com.ruoyi.system.domain.Message" useGeneratedKeys="true" keyProperty="id">
         insert into message
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="createdBy != null">CREATED_BY,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateMessage" parameterType="Message">
+    <update id="updateMessage" parameterType="com.ruoyi.system.domain.Message">
         update message
         <trim prefix="SET" suffixOverrides=",">
             <if test="createdBy != null">CREATED_BY = #{createdBy},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml
index f4562a03..b7197e03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ShAreaMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ShAreaMapper">
     
-    <resultMap type="ShArea" id="ShAreaResult">
+    <resultMap type="com.ruoyi.system.domain.ShArea" id="ShAreaResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
         <result property="shortname"    column="shortname"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, pid, shortname, cityName, merger_name, level, pinyin, code, zip_code, first, longitude, latitude, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME from sh_area
     </sql>
 
-    <select id="selectShAreaList" parameterType="ShArea" resultMap="ShAreaResult">
+    <select id="selectShAreaList" parameterType="com.ruoyi.system.domain.ShArea" resultMap="ShAreaResult">
         <include refid="selectShAreaVo"/>
         <where>  
             <if test="pid != null "> and pid = #{pid}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY distance LIMIT 1
     </select>
 
-    <insert id="insertShArea" parameterType="ShArea" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertShArea" parameterType="com.ruoyi.system.domain.ShArea" useGeneratedKeys="true" keyProperty="id">
         insert into sh_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="pid != null">pid,</if>
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateShArea" parameterType="ShArea">
+    <update id="updateShArea" parameterType="com.ruoyi.system.domain.ShArea">
         update sh_area
         <trim prefix="SET" suffixOverrides=",">
             <if test="pid != null">pid = #{pid},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index b1570e28..31576f42 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
     
-    <resultMap type="SysConfig" id="SysConfigResult">
+    <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />
         <result property="configName"    column="config_name"    />
         <result property="configKey"     column="config_key"     />
@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</sql>
     
-    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
     </select>
     
-    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
 			<if test="configName != null and configName != ''">
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where config_key = #{configKey} limit 1
     </select>
     
-    <insert id="insertConfig" parameterType="SysConfig">
+    <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
         insert into sys_config (
 			<if test="configName != null and configName != '' ">config_name,</if>
 			<if test="configKey != null and configKey != '' ">config_key,</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		)
     </insert>
 	 
-    <update id="updateConfig" parameterType="SysConfig">
+    <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
         update sys_config 
         <set>
             <if test="configName != null and configName != ''">config_name = #{configName},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 000166ed..ec9efa39 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysDept" id="SysDeptResult">
 		<id     property="deptId"     column="dept_id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_dept d
     </sql>
     
-	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+	<select id="selectDeptList" parameterType="com.ruoyi.system.api.domain.SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
     
-    <insert id="insertDept" parameterType="SysDept">
+    <insert id="insertDept" parameterType="com.ruoyi.system.api.domain.SysDept">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 	
-	<update id="updateDept" parameterType="SysDept">
+	<update id="updateDept" parameterType="com.ruoyi.system.api.domain.SysDept">
  		update sys_dept
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 75d80a15..b0eb6754 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
 	
-	<resultMap type="SysDictData" id="SysDictDataResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dict_data
     </sql>
 
-	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+	<select id="selectDictDataList" parameterType="com.ruoyi.system.api.domain.SysDictData" resultMap="SysDictDataResult">
 	    <include refid="selectDictDataVo"/>
 		<where>
 		    <if test="dictType != null and dictType != ''">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by dict_sort asc
 	</select>
 	
-	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+	<select id="selectDictDataByType" parameterType="com.ruoyi.system.api.domain.SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 	
-	<update id="updateDictData" parameterType="SysDictData">
+	<update id="updateDictData" parameterType="com.ruoyi.system.api.domain.SysDictData">
  		update sys_dict_data
  		<set>
  			<if test="dictSort != null">dict_sort = #{dictSort},</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
  	
- 	<insert id="insertDictData" parameterType="SysDictData">
+ 	<insert id="insertDictData" parameterType="com.ruoyi.system.api.domain.SysDictData">
  		insert into sys_dict_data(
  			<if test="dictSort != null">dict_sort,</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 2b44b2ee..e5184908 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="SysDictType" id="SysDictTypeResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dict_type
     </sql>
 
-	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+	<select id="selectDictTypeList" parameterType="com.ruoyi.system.api.domain.SysDictType" resultMap="SysDictTypeResult">
 	    <include refid="selectDictTypeVo"/>
 		<where>
 		    <if test="dictName != null and dictName != ''">
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 
- 	<update id="updateDictType" parameterType="SysDictType">
+ 	<update id="updateDictType" parameterType="com.ruoyi.system.api.domain.SysDictType">
  		update sys_dict_type
  		<set>
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where dict_id = #{dictId}
 	</update>
  	
- 	<insert id="insertDictType" parameterType="SysDictType">
+ 	<insert id="insertDictType" parameterType="com.ruoyi.system.api.domain.SysDictType">
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 4f400694..20e1fdf2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
 
-	<resultMap type="SysLogininfor" id="SysLogininforResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
 		<result property="status"        column="status"            />
@@ -13,12 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="accessTime"    column="access_time"       />
 	</resultMap>
 
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
+	<insert id="insertLogininfor" parameterType="com.ruoyi.system.api.domain.SysLogininfor">
 		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
 		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
 	</insert>
 	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+	<select id="selectLogininforList" parameterType="com.ruoyi.system.api.domain.SysLogininfor" resultMap="SysLogininforResult">
 		select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index e90f6baf..88b33472 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -4,7 +4,7 @@
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
 
-	<resultMap type="SysMenu" id="SysMenuResult">
+	<resultMap type="com.ruoyi.system.domain.SysMenu" id="SysMenuResult">
 		<id     property="menuId"         column="menu_id"        />
 		<result property="menuName"       column="menu_name"      />
 		<result property="parentName"     column="parent_name"    />
@@ -32,7 +32,7 @@
 		from sys_menu
     </sql>
     
-    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
+    <select id="selectMenuList" parameterType="com.ruoyi.system.domain.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="menuName != null and menuName != ''">
@@ -54,7 +54,7 @@
 		order by m.parent_id, m.order_num
 	</select>
 	
-	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+	<select id="selectMenuListByUserId" parameterType="com.ruoyi.system.domain.SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -127,12 +127,12 @@
 	    select count(1) from sys_menu where parent_id = #{menuId}  
 	</select>
 	
-	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
+	<select id="checkMenuNameUnique" parameterType="com.ruoyi.system.domain.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
 	</select>
 	
-	<update id="updateMenu" parameterType="SysMenu">
+	<update id="updateMenu" parameterType="com.ruoyi.system.domain.SysMenu">
 		update sys_menu
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
@@ -155,7 +155,7 @@
 		where menu_id = #{menuId}
 	</update>
 
-	<insert id="insertMenu" parameterType="SysMenu">
+	<insert id="insertMenu" parameterType="com.ruoyi.system.domain.SysMenu">
 		insert into sys_menu(
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 6915a148..b633cdc3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
     
-    <resultMap type="SysNotice" id="SysNoticeResult">
+    <resultMap type="com.ruoyi.system.domain.SysNotice" id="SysNoticeResult">
         <result property="noticeId"       column="notice_id"       />
         <result property="noticeTitle"    column="notice_title"    />
         <result property="noticeType"     column="notice_type"     />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where notice_id = #{noticeId}
     </select>
     
-    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
+    <select id="selectNoticeList" parameterType="com.ruoyi.system.domain.SysNotice" resultMap="SysNoticeResult">
         <include refid="selectNoticeVo"/>
         <where>
 			<if test="noticeTitle != null and noticeTitle != ''">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
     </select>
     
-    <insert id="insertNotice" parameterType="SysNotice">
+    <insert id="insertNotice" parameterType="com.ruoyi.system.domain.SysNotice">
         insert into sys_notice (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		)
     </insert>
 	 
-    <update id="updateNotice" parameterType="SysNotice">
+    <update id="updateNotice" parameterType="com.ruoyi.system.domain.SysNotice">
         update sys_notice 
         <set>
             <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 1d3d5aab..2bee6a56 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
 
-	<resultMap type="SysOperLog" id="SysOperLogResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
@@ -27,12 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_oper_log
     </sql>
     
-	<insert id="insertOperlog" parameterType="SysOperLog">
+	<insert id="insertOperlog" parameterType="com.ruoyi.system.api.domain.SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time)
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
 	</insert>
 	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+	<select id="selectOperLogList" parameterType="com.ruoyi.system.api.domain.SysOperLog" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="title != null and title != ''">
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 2425ae05..4fc53076 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
 
-	<resultMap type="SysPost" id="SysPostResult">
+	<resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
 		<id     property="postId"        column="post_id"       />
 		<result property="postCode"      column="post_code"     />
 		<result property="postName"      column="post_name"     />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_post
     </sql>
 	
-	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+	<select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
 	    <include refid="selectPostVo"/>
 		<where>
 			<if test="postCode != null and postCode != ''">
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		 where post_code=#{postCode} limit 1
 	</select>
 	
-	<update id="updatePost" parameterType="SysPost">
+	<update id="updatePost" parameterType="com.ruoyi.system.domain.SysPost">
  		update sys_post
  		<set>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where post_id = #{postId}
 	</update>
  	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+ 	<insert id="insertPost" parameterType="com.ruoyi.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
  		insert into sys_post(
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index 700671e1..c2815f24 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
 
-	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
+	<resultMap type="com.ruoyi.system.domain.SysRoleDept" id="SysRoleDeptResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="deptId"     column="dept_id"      />
 	</resultMap>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 12e7f78e..e785119a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
-	<resultMap type="SysRole" id="SysRoleResult">
+	<resultMap type="com.ruoyi.system.api.domain.SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
     
-    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+    <select id="selectRoleList" parameterType="com.ruoyi.system.api.domain.SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
 		<if test="roleId != null and roleId != 0">
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
 	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+ 	<insert id="insertRole" parameterType="com.ruoyi.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 	
-	<update id="updateRole" parameterType="SysRole">
+	<update id="updateRole" parameterType="com.ruoyi.system.api.domain.SysRole">
  		update sys_role
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index e75bb174..4cc2bef8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
 
-	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+	<resultMap type="com.ruoyi.system.domain.SysRoleMenu" id="SysRoleMenuResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9f1839c1..ea73e2b9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-    <resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="com.ruoyi.system.api.domain.SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
@@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+        <association property="dept"    column="dept_id" javaType="com.ruoyi.system.api.domain.SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
     </resultMap>
 	
-    <resultMap id="deptResult" type="SysDept">
+    <resultMap id="deptResult" type="com.ruoyi.system.api.domain.SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
         <result property="deptName"  column="dept_name"   />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="dept_status" />
     </resultMap>
 	
-    <resultMap id="RoleResult" type="SysRole">
+    <resultMap id="RoleResult" type="com.ruoyi.system.api.domain.SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
         <result property="roleKey"      column="role_key"       />
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
     
-    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+    <select id="selectUserList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 	
-	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	<select id="selectAllocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 	
-	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	<select id="selectUnallocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 	
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+	<insert id="insertUser" parameterType="com.ruoyi.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 	
-	<update id="updateUser" parameterType="SysUser">
+	<update id="updateUser" parameterType="com.ruoyi.system.api.domain.SysUser">
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
@@ -195,15 +195,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where user_id = #{userId}
 	</update>
 	
-	<update id="updateUserStatus" parameterType="SysUser">
+	<update id="updateUserStatus" parameterType="com.ruoyi.system.api.domain.SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
 	
-	<update id="updateUserAvatar" parameterType="SysUser">
+	<update id="updateUserAvatar" parameterType="com.ruoyi.system.api.domain.SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
 	
-	<update id="resetUserPwd" parameterType="SysUser">
+	<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 21c40981..0ff0cb91 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
+	<resultMap type="com.ruoyi.system.domain.SysUserPost" id="SysUserPostResult">
 		<result property="userId"     column="user_id"      />
 		<result property="postId"     column="post_id"      />
 	</resultMap>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 95e07adb..b210005d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
+	<resultMap type="com.ruoyi.system.domain.SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 	</insert>
 	
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+	<delete id="deleteUserRoleInfo" parameterType="com.ruoyi.system.domain.SysUserRole">
 		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 	
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml
index 2ac16068..a3638641 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeamMembersMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.TeamMembersMapper">
     
-    <resultMap type="TeamMembers" id="TeamMembersResult">
+    <resultMap type="com.ruoyi.system.domain.TeamMembers" id="TeamMembersResult">
         <result property="id"    column="id"    />
         <result property="teamId"    column="team_id"    />
         <result property="userId"    column="user_id"    />
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getOneByTeamIdAndRoleCode" resultType="com.ruoyi.system.domain.TeamMembers">
         select * from team_members where teamId = #{teamId} and roleCode = #{roleCode} limit 1
     </select>
-    <insert id="insertTeamMembers" parameterType="TeamMembers" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTeamMembers" parameterType="com.ruoyi.system.domain.TeamMembers" useGeneratedKeys="true" keyProperty="id">
         insert into team_members
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="teamId != null">team_id,</if>
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateTeamMembers" parameterType="TeamMembers">
+    <update id="updateTeamMembers" parameterType="com.ruoyi.system.domain.TeamMembers">
         update team_members
         <trim prefix="SET" suffixOverrides=",">
             <if test="teamId != null">team_id = #{teamId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml
index b23d5396..6b9aa6c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TokenInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.TokenInfoMapper">
     
-    <resultMap type="TokenInfo" id="TokenInfoResult">
+    <resultMap type="com.ruoyi.system.domain.TokenInfo" id="TokenInfoResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, MAIN_TOKEN, KIK_TOKEN from token_info
     </sql>
 
-    <select id="selectTokenInfoList" parameterType="TokenInfo" resultMap="TokenInfoResult">
+    <select id="selectTokenInfoList" parameterType="com.ruoyi.system.domain.TokenInfo" resultMap="TokenInfoResult">
         <include refid="selectTokenInfoVo"/>
         <where>  
             <if test="isDeleted != null "> and IS_DELETED = #{isDeleted}</if>
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertTokenInfo" parameterType="TokenInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTokenInfo" parameterType="com.ruoyi.system.domain.TokenInfo" useGeneratedKeys="true" keyProperty="id">
         insert into token_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateTokenInfo" parameterType="TokenInfo">
+    <update id="updateTokenInfo" parameterType="com.ruoyi.system.domain.TokenInfo">
         update token_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml
index 014a63a7..0d6af41a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TrainingInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.TrainingInfoMapper">
     
-    <resultMap type="TrainingInfo" id="TrainingInfoResult">
+    <resultMap type="com.ruoyi.system.domain.TrainingInfo" id="TrainingInfoResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, TRAIN_NAME, PHONE, LINKMAN, TRAIN_DESC, BUILD_ID, DEFAULT_PICTURE, PRICE from training_info
     </sql>
 
-    <select id="selectTrainingInfoList" parameterType="TrainingInfo" resultMap="TrainingInfoResult">
+    <select id="selectTrainingInfoList" parameterType="com.ruoyi.system.domain.TrainingInfo" resultMap="TrainingInfoResult">
         <include refid="selectTrainingInfoVo"/>
         <where>  
             <if test="isDeleted != null "> and IS_DELETED = #{isDeleted}</if>
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertTrainingInfo" parameterType="TrainingInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTrainingInfo" parameterType="com.ruoyi.system.domain.TrainingInfo" useGeneratedKeys="true" keyProperty="id">
         insert into training_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateTrainingInfo" parameterType="TrainingInfo">
+    <update id="updateTrainingInfo" parameterType="com.ruoyi.system.domain.TrainingInfo">
         update training_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml
index 8ab86831..85d35b12 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserBuildingRelMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.UserBuildingRelMapper">
     
-    <resultMap type="UserBuildingRel" id="UserBuildingRelResult">
+    <resultMap type="com.ruoyi.system.domain.UserBuildingRel" id="UserBuildingRelResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, USER_CODE, BUILDING_ID from user_building_rel
     </sql>
 
-    <select id="selectUserBuildingRelList" parameterType="UserBuildingRel" resultMap="UserBuildingRelResult">
+    <select id="selectUserBuildingRelList" parameterType="com.ruoyi.system.domain.UserBuildingRel" resultMap="UserBuildingRelResult">
         <include refid="selectUserBuildingRelVo"/>
         <where>  
             <if test="isDeleted != null  and isDeleted != ''"> and IS_DELETED = #{isDeleted}</if>
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ID = #{id}
     </select>
         
-    <insert id="insertUserBuildingRel" parameterType="UserBuildingRel">
+    <insert id="insertUserBuildingRel" parameterType="com.ruoyi.system.domain.UserBuildingRel">
         insert into user_building_rel
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">ID,</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateUserBuildingRel" parameterType="UserBuildingRel">
+    <update id="updateUserBuildingRel" parameterType="com.ruoyi.system.domain.UserBuildingRel">
         update user_building_rel
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
index 656f3bbb..2a997bc6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.UserRoleMapper">
     
-    <resultMap type="UserRole" id="UserRoleResult">
+    <resultMap type="com.ruoyi.system.domain.UserRole" id="UserRoleResult">
         <result property="id"    column="ID"    />
         <result property="userId"    column="USER_ID"    />
         <result property="roleCode"    column="ROLE_CODE"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, USER_ID, ROLE_CODE, CREATED_TIME, CREATED_BY, MODIFIED_BY, IS_DELETED, LAST_UPDATED_TIME, ROLE_ID from user_role
     </sql>
 
-    <select id="selectUserRoleList" parameterType="UserRole" resultMap="UserRoleResult">
+    <select id="selectUserRoleList" parameterType="com.ruoyi.system.domain.UserRole" resultMap="UserRoleResult">
         <include refid="selectUserRoleVo"/>
         <where>  
             <if test="userId != null "> and USER_ID = #{userId}</if>
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from user_role where USER_ID = #{userId}
     </select>
 
-    <insert id="insertUserRole" parameterType="UserRole" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertUserRole" parameterType="com.ruoyi.system.domain.UserRole" useGeneratedKeys="true" keyProperty="id">
         insert into user_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">USER_ID,</if>
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateUserRole" parameterType="UserRole">
+    <update id="updateUserRole" parameterType="com.ruoyi.system.domain.UserRole">
         update user_role
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">USER_ID = #{userId},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml
index 64251705..c1967546 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.UserWxAqrCodeMapper">
 
-    <resultMap type="UserWxAqrCode" id="UserWxAqrCodeResult">
+    <resultMap type="com.ruoyi.system.domain.UserWxAqrCode" id="UserWxAqrCodeResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -28,7 +28,7 @@
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, scene, code_img_url, user_id, bus_type, page, width, use_desc, jersey_no, team_id,competition_of_team_id,competition_members_id from user_wx_aqr_code
     </sql>
 
-    <select id="selectUserWxAqrCodeList1" parameterType="UserWxAqrCode" resultMap="UserWxAqrCodeResult">
+    <select id="selectUserWxAqrCodeList1" parameterType="com.ruoyi.system.domain.UserWxAqrCode" resultMap="UserWxAqrCodeResult">
         <include refid="selectUserWxAqrCodeVo"/>
         <where>
             <if test="createdBy != null  and createdBy != ''"> and CREATED_BY like concat('%', #{createdBy}, '%')</if>
@@ -74,7 +74,7 @@
         </where>
     </select>
 
-    <insert id="insertUserWxAqrCode" parameterType="UserWxAqrCode" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertUserWxAqrCode" parameterType="com.ruoyi.system.domain.UserWxAqrCode" useGeneratedKeys="true" keyProperty="id">
         insert into user_wx_aqr_code
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -114,7 +114,7 @@
         </trim>
     </insert>
 
-    <update id="updateUserWxAqrCode" parameterType="UserWxAqrCode">
+    <update id="updateUserWxAqrCode" parameterType="com.ruoyi.system.domain.UserWxAqrCode">
         update user_wx_aqr_code
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml
index 7c4d7f39..5ef04ba6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBasketballTeamMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WxBasketballTeamMapper">
     
-    <resultMap type="WxBasketballTeam" id="WxBasketballTeamResult">
+    <resultMap type="com.ruoyi.system.domain.WxBasketballTeam" id="WxBasketballTeamResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, TEAM_NAME, TEAM_DES, REMARK, BUILD_ID, DEFAULT_PICTURE, BUILDING_NAME, CREATED_ID, CONTACT_TEL, team_logo from basketball_team
     </sql>
 
-    <select id="selectWxBasketballTeamList" parameterType="WxBasketballTeam" resultMap="WxBasketballTeamResult">
+    <select id="selectWxBasketballTeamList" parameterType="com.ruoyi.system.domain.WxBasketballTeam" resultMap="WxBasketballTeamResult">
         <include refid="selectWxBasketballTeamVo"/>
         <where>  
             <if test="teamName != null  and teamName != ''"> and TEAM_NAME like concat('%', #{teamName}, '%')</if>
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.created_time desc
     </select>
 
-    <insert id="insertWxBasketballTeam" parameterType="WxBasketballTeam" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertWxBasketballTeam" parameterType="com.ruoyi.system.domain.WxBasketballTeam" useGeneratedKeys="true" keyProperty="id">
         insert into basketball_team
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateWxBasketballTeam" parameterType="WxBasketballTeam">
+    <update id="updateWxBasketballTeam" parameterType="com.ruoyi.system.domain.WxBasketballTeam">
         update basketball_team
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
index 10700320..68d87f27 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WxBuildingInfoMapper">
     
-    <resultMap type="WxBuildingInfo" id="WxBuildingInfoResult">
+    <resultMap type="com.ruoyi.system.domain.WxBuildingInfo" id="WxBuildingInfoResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, BUILDING_NAME, ADDRESS, LONGITUDE, LATITUDE, PROVINCE_CODE, CITY_CODE, COUNTY_CODE, REMARK, CITY_NAME, DEFAULT_PICTURE, IS_SUPPORTLIVE, STATUS, REJECT_REASON, IS_OPEN, MITTELKURS, CHAT_GROUP_URL, CREATED_ID from building_info
     </sql>
 
-    <select id="selectWxBuildingInfoList" parameterType="WxBuildingInfo" resultMap="WxBuildingInfoResult">
+    <select id="selectWxBuildingInfoList" parameterType="com.ruoyi.system.domain.WxBuildingInfo" resultMap="WxBuildingInfoResult">
         <include refid="selectWxBuildingInfoVo"/>
         <where>  
             <if test="id != null "> and ID = #{id}</if>
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <insert id="insertWxBuildingInfo" parameterType="WxBuildingInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertWxBuildingInfo" parameterType="com.ruoyi.system.domain.WxBuildingInfo" useGeneratedKeys="true" keyProperty="id">
         insert into building_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateWxBuildingInfo" parameterType="WxBuildingInfo">
+    <update id="updateWxBuildingInfo" parameterType="com.ruoyi.system.domain.WxBuildingInfo">
         update building_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
index 726c1a8a..b34889d2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WxUserMapper">
     
-    <resultMap type="WxUser" id="WxUserResult">
+    <resultMap type="com.ruoyi.system.domain.WxUser" id="WxUserResult">
         <result property="id"    column="ID"    />
         <result property="isDeleted"    column="IS_DELETED"    />
         <result property="createdTime"    column="CREATED_TIME"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID,REAL_NAME from user_info
     </sql>
 
-    <select id="selectWxUserList" parameterType="WxUser" resultMap="WxUserResult">
+    <select id="selectWxUserList" parameterType="com.ruoyi.system.domain.WxUser" resultMap="WxUserResult">
         <include refid="selectWxUserVo"/>
         <where>  
             <if test="isDeleted != null "> and IS_DELETED = #{isDeleted}</if>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
     </select>
 
-    <insert id="insertWxUser" parameterType="WxUser" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertWxUser" parameterType="com.ruoyi.system.domain.WxUser" useGeneratedKeys="true" keyProperty="id">
         insert into user_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED,</if>
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateWxUser" parameterType="WxUser">
+    <update id="updateWxUser" parameterType="com.ruoyi.system.domain.WxUser">
         update user_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDeleted != null">IS_DELETED = #{isDeleted},</if>
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
index 95396ab3..40eb79ae 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.0.1.91:30005
+        server-addr: 192.168.1.211:30006
+        namespace: local
       config:
         # 配置中心地址
-        server-addr: 10.0.1.91:30005
+        server-addr: 192.168.1.211:30006
+        namespace: local
         # 配置文件格式
         file-extension: yml
         # 共享配置