From b8e2c0dee6ae4520a2e0e783b416825d872c8f9e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 16:38:11 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 33c70be..c7c1561 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -30,6 +30,7 @@
<!-- 扩展字段 -->
<result property="shopName" column="SHOP_NAME"/>
+ <result property="shopShortName" column="SHOP_SHORT_NAME"/>
<result property="vipPhone" column="PHONE"/>
@@ -321,6 +322,7 @@
a.*,
c.su_name as STAFF_NAME,
d.SHOP_NAME,
+ d.shop_short_name,
b.PHONE,
b.VIP_NAME
from sys_order a
--
Gitblit v1.9.1