From 3e37cdb5e8528cab3fba9faa1559bef5f381e50e Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Wed, 24 Apr 2024 14:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/common/core/config/MybatisPlusConfig.java   | 3 ++-
 src/main/java/com/gxwebsoft/common/system/entity/Order.java   | 4 ++--
 .../com/gxwebsoft/common/system/mapper/xml/OrderMapper.xml    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
index 23477b4..de3808c 100644
--- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
@@ -59,7 +59,8 @@ public class MybatisPlusConfig {
           "sys_user_oauth",
           "sys_email_record",
           "sys_plug",
-          "sys_version"
+          "sys_version",
+          "sys_order"
         ).contains(tableName);
       }
     };
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Order.java b/src/main/java/com/gxwebsoft/common/system/entity/Order.java
index f5ee634..984e2dc 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Order.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Order.java
@@ -130,8 +130,8 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "昵称")
+    @ApiModelProperty(value = "租户名称")
     @TableField(exist = false)
-    private String nickname;
+    private String tenantName;
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrderMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrderMapper.xml
index 80b1bc3..daa951f 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrderMapper.xml
@@ -4,8 +4,9 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*,b.tenant_name
         FROM sys_order a
+        LEFT JOIN sys_tenant b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.orderId != null">
                 AND a.order_id = #{param.orderId}