From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/impl/CompanyTargetServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CompanyTargetServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CompanyTargetServiceImpl.java
index ed744ac..ac01a0b 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CompanyTargetServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CompanyTargetServiceImpl.java
@@ -10,7 +10,12 @@
public class CompanyTargetServiceImpl extends ServiceImpl<CompanyTargetMapper, CompanyTarget> implements CompanyTargetService {
@Override
- public CompanyTarget selectByYear(String year) {
- return this.baseMapper.selectByYear(year);
+ public CompanyTarget selectCompanyByYear(String year) {
+ return this.baseMapper.selectCompanyByYear(year);
+ }
+
+ @Override
+ public CompanyTarget selectPersonByYear(String year, Long staff) {
+ return this.baseMapper.selectPersonByYear(year, staff);
}
}
--
Gitblit v1.9.1