From 7387cb3e2f9e8b588c7be30b129faeee4050034d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 18:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index 309ddfb..927d7f8 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -34,9 +34,7 @@
<result property="companyId" column="company_id" />
</resultMap>
- <select id="selectInvitationuserInPage" resultType="com.matrix.system.fenxiao.entity.ShopSalesmanApply">
-select * from shop_salesman_apply
-<!--
+ <select id="selectInvitationuserInPage" resultType="com.matrix.system.shopXcx.vo.SalesmanVo">
SELECT
a.nick_name,
a.avatar_url,
@@ -55,7 +53,7 @@
biz_user a
WHERE
a.parent_open_id = #{openId}
- AND a.is_sales = 1 -->
+ AND a.is_sales = 1
</select>
--
Gitblit v1.9.1