Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-25 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml

@@ -45,4 +45,24 @@
      a.company_id = #{companyId}
   </select>

   <select id="findFyfaManageList" resultType="com.matrix.system.fenxiao.vo.FyfaManageVo">
      SELECT
         a.id id,
         a.name name,
         a.self_commission selfCommission,
         a.seales_commission sealesCommission,
         a.invitation_commission invitationCommission,
         a.grade_condition gradeCondition,
         a.is_default isDefault
      FROM
      shop_salesman_grade a
      <where>
         a.company_id = #{record.companyId}
      </where>
      <if test="record.sort !=null">
         order by
         a.${record.sort} ${record.order}
      </if>
   </select>

</mapper>