From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
index e881f7a..52b6c4f 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -24,9 +24,9 @@
*/
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {
- IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId, @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("openId") String openId);
+ IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("userId") Long userId);
IPage<ShopSalesmanApplyVo> findShopSalesmanApplyList(Page<ShopSalesmanApplyVo> page,
@Param("record")ShopSalesmanApplyDto shopSalesmanApplyDto);
@@ -37,9 +37,9 @@
IPage<ShopSalesmanAppliingVo> selectBizUserApplyList(Page<ShopSalesmanAppliingVo> page,
@Param("record")ShopSalesmanAppliingDto shopSalesmanAppliingDto);
- SalesmanCenterInfo selectSalesmanCenterInfo(String openId);
+ SalesmanCenterInfo selectSalesmanCenterInfo(Long id);
- SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(@Param("userId")String userId,
+ SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(@Param("userId")Long userId,
@Param("companyId")Long companyId,@Param("applyId")long applyId);
IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
--
Gitblit v1.9.1