Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -150,7 +150,6 @@ public class StudentStatisticsController {
                 .select("t3.name", StudentStatisticsPageVo::getTeacherName)
                 .selectAs(User::getName, StudentStatisticsPageVo::getStudentName)
                 .selectAs(User::getId, StudentStatisticsPageVo::getUserId)
-                .selectAs(BaseStudentSchoolRoll::getStduyStatus, StudentStatisticsPageVo::getStduyStatusCn)
                 .selectAs(DictionaryDetail::getName, StudentStatisticsPageVo::getStduyStatusCn)
                 .selectAs(User::getCredentialNumber, StudentStatisticsPageVo::getCredentialNumber)
                 .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, User::getId)