Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

 src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
import java.util.Map;

/**
 *  Mapper 接口
@@ -38,5 +39,5 @@
    * @return
    */
   List<PerformanceVO> selectPerformancePage(IPage page, PerformanceVO performance);

   Map<String, String> queryYearPer(String year);
}