Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java

@@ -24,7 +24,7 @@
 */
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {

    IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("id") Long userId, @Param("isSales")String isSales);
    IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("userId") Long userId, @Param("isSales")String isSales);

    IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("userId") Long userId);