框架集成MyBatis-Plus使得编码更加方便

2026-01-26 11:51:55 +08:00 · 2023-08-30 16:20:17 +08:00
parent 3c42eee7bf
commit 6653d88b69
162 changed files with 464 additions and 554 deletions
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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) */
--- 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) */
--- 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) */
--- 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) */
--- 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) */
--- 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) */
--- 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 */
--- 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 */
--- 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;

    /** 单据类型 */
--- 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 */
--- 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();
-    }
 }
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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;

    /** 删除表示 */
--- 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;

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

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

    /** 删除 */
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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接口
 * 
--- 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;
--- 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接口
 * 
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;

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

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

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

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

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

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

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

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

--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
    }
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- a/Show More
+++ b/Show More