Merge branch 'master' into 'test'

绩效总分列表优化

See merge request !3

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -379,7 +379,7 @@ public class QuestionnaireCtrl {
         List<PerformanceSummary> performanceSummaryList = questionnaireService.selectPerformanceSummaryList(performanceSummary);
         if(performanceSummaryList.size() > 0){
             for(PerformanceSummary total : performanceSummaryList){
-                //家畜指标最高30分，引导指标最高50分，奖励指标最高10分
+                //基础指标最高30分，引导指标最高50分，奖励指标最高10分
                 if(total.getGuideIndicators() > 50){
                     total.setGuideIndicators(50);
                 }