From b0ee5ab18f8242d0ca81966c07db00e0c6274831 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 14 Mar 2021 07:21:16 +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 |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 af0d1eb..925af26 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
@@ -5,7 +5,10 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
 import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
+import com.matrix.system.fenxiao.dto.ShopSalesmanDetailDto;
 import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
+import com.matrix.system.fenxiao.vo.SalesmanBasicDetailVo;
+import com.matrix.system.fenxiao.vo.ShopCustomDetailVo;
 import com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo;
 import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
 import com.matrix.system.shopXcx.vo.SalesmanCenterInfo;
@@ -33,4 +36,13 @@
 			@Param("record")ShopSalesmanAppliingDto shopSalesmanAppliingDto);
 
     SalesmanCenterInfo selectSalesmanCenterInfo(String openId);
+
+	SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(@Param("userId")String userId, @Param("companyId")Long companyId);
+
+	IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
+											   @Param("record")ShopSalesmanDetailDto shopSalesmanDetailDto);
+
+	IPage<ShopCustomDetailVo> findCustomLow(Page<ShopCustomDetailVo> pageLow,
+			@Param("record")ShopSalesmanDetailDto shopSalesmanDetailDto);
+	
 }
\ No newline at end of file

--
Gitblit v1.9.1