From 26ffb618e472c3681f17b8b1b1a19ea55383928c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 18:28:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
index 9cf76e9..311d174 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
@@ -13,7 +13,7 @@
<result property="name" column="name" />
<result property="sealesCommission" column="seales_commission" />
<result property="invitationCommission" column="invitation_commission" />
- <result property="condition" column="condition" />
+ <result property="gradeCondition" column="grade_condition" />
<result property="isDefault" column="is_default" />
<result property="companyId" column="company_id" />
</resultMap>
@@ -29,9 +29,20 @@
<result property="name" column="name" />
<result property="sealesCommission" column="seales_commission" />
<result property="invitationCommission" column="invitation_commission" />
- <result property="condition" column="condition" />
+ <result property="gradeCondition" column="grade_condition" />
<result property="isDefault" column="is_default" />
<result property="companyId" column="company_id" />
</resultMap>
+
+ <select id="getShopSalesmanGradeVo" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanGradeVo">
+ SELECT
+ a.id,
+ a.name
+ FROM
+ shop_salesman_grade a
+ where
+ a.company_id = #{companyId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1