Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-09-14 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4

 src/main/java/com/zy/crm/manager/mapper/CompanyTargetMapper.java

@@ -9,6 +9,8 @@
@Repository
public interface CompanyTargetMapper extends BaseMapper<CompanyTarget> {

    CompanyTarget selectByYear(String year);
    CompanyTarget selectCompanyByYear(String year);

    CompanyTarget selectPersonByYear(String year, Long staff);

}