From 1e4e6e8aa4b738320bf8b5a0ee43aa62ca2c13e7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 14:46:36 +0800
Subject: [PATCH] finish paiban add proj

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml
index da0bb54..a759d6f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml
@@ -16,7 +16,7 @@
 		<result property="status" column="status" />
 		<result property="nickName" column="nick_name" />
 		<result property="shopName" column="shop_short_name" />
-		<result property="phone" column="phone_number" />
+		<result property="phone" column="phone" />
 		<collection property="salonAttr" ofType="com.matrix.system.shopXcx.bean.ShopActivitiesSalonAttrRecord">
 			<id property="id" column="asd_id" />
 			<result property="attrName" column="attr_name" />
@@ -184,10 +184,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="selectInPage" resultMap="ShopActivitiesSalonRecordMap">
-		select t1.*, t3.nick_name, t3.phone_number, t4.shop_short_name, t2.id asd_id, t2.attr_name, t2.attr_value, t2.asr_id
+		select t1.*, t3.nick_name, t3.phone, t4.shop_short_name, t2.id asd_id, t2.attr_name, t2.attr_value, t2.asr_id
 		from shop_activities_salon_record t1
 		inner join shop_activities_salon_attr_record t2 on t1.id=t2.asr_id
-		left join biz_user t3 on t1.user_id=open_id
+		left join sys_vip_info t3 on t1.user_id=id
 		left join sys_shop_info t4 on t1.shop_id=t4.id
 		<where>
 		  <include refid="where_sql"></include>

--
Gitblit v1.9.1