From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Wed, 14 Apr 2021 19:39:45 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml index 1ed2da7..e55332e 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCollectionDao.xml @@ -32,7 +32,7 @@ <result property="delFlag" column="del_flag" /> <result property="userName" column="user_name" /> <result property="nickName" column="nick_name" /> - <result property="phoneNumber" column="phone_number" /> + <result property="phoneNumber" column="phone" /> <result property="companyId" column="company_id" /> </resultMap> @@ -215,10 +215,10 @@ c.coll_productid, u.user_name, u.nick_name, - u.phone_number, + u.phone, p.title from shop_collection c - LEFT JOIN biz_user u ON c.coll_userid = u.open_id + LEFT JOIN sys_vip_info u ON c.coll_userid = u.id LEFT JOIN shop_product p ON c.coll_productid = p.id <where> <include refid="where_sql"></include> @@ -236,7 +236,7 @@ <select id="selectTotalRecord" parameterType="long" resultType="java.lang.Integer"> select count(*) from shop_collection c - LEFT JOIN biz_user u ON c.coll_userid = u.open_id + LEFT JOIN sys_vip_info u ON c.coll_userid = u.id LEFT JOIN shop_product p ON c.coll_productid = p.id <where> <include refid="where_sql"></include> -- Gitblit v1.9.1