From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 f8a5e83..4b5aad7 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
@@ -38,7 +38,8 @@
SalesmanCenterInfo selectSalesmanCenterInfo(String openId);
- SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(@Param("userId")String userId, @Param("companyId")Long companyId);
+ SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(@Param("userId")String userId,
+ @Param("companyId")Long companyId,@Param("applyId")long applyId);
IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
@Param("record")ShopSalesmanDetailDto shopSalesmanDetailDto);
--
Gitblit v1.9.1