Merge branch 'master' into 'test'

问卷管理审批-导出优化

See merge request !27

src/main/resources/mapper/Questionnaire.xml

@@ -231,7 +231,7 @@
 			MAX((CASE WHEN t_answer.`group`=21 THEN t_answer.score ELSE 0 END)) AS rewardIndexFive
 		FROM t_answer
 		LEFT JOIN t_record ON t_record.id = t_answer.record_id
-		GROUP BY t_record.create_by
+		GROUP BY t_record.id
 	</select>
 
 	<!--2022年10月新增加功能问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据-->