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 @@ - SELECT a.* + SELECT a.*,b.tenant_name FROM sys_order a + LEFT JOIN sys_tenant b ON a.tenant_id = b.tenant_id AND a.order_id = #{param.orderId}