Merge remote-tracking branch 'origin/master'

EricsHu

2023-11-24 3a27392dc23193ae839526efd779f36589bc91cc

 src/main/java/com/qxueyou/scc/controller/SchoolRollController.java

@@ -46,8 +46,7 @@

        return new Result(true,"success", CollectionUtils.newObjectMap("schoolRollList",
                QBeanUtils.listBean2ListMap(schoolRollList,
                        CollectionUtils.newStringMap("name", "studentName","studentId","studentId", "studentNo", "studentNo","sex","sex", "status",
                                "status", "createTime", "createTime","mobilePhone","mobilePhone","studentNumber","studentNumber")),
                        CollectionUtils.newStringMap("name", "studentName","studentId","studentId", "studentNo", "studentNo","sex","sex", "status", "status", "createTime", "createTime","mobilePhone","mobilePhone","studentNumber","studentNumber","photo","photo","passporName","passporName","nationality","nationality","ancestralHome","ancestralHome","birthday","birthday","birthplace","birthplace","chinaStatus","chinaStatus","registeredAddress","registeredAddress","homeAddress","homeAddress","religiousBelief","religiousBelief","email","email","workUnit","workUnit","graduationDestination","graduationDestination")),
                "schoolrollCount", count));
    }