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/ShopSalesmanGradeDao.xml | 4 ++-- 1 files changed, 2 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..499ab09 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,7 +29,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> -- Gitblit v1.9.1