# Conflicts: # sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java # sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolMapper.java # sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java # sapi/src/main/resources/mapper/system/SchoolMapper.xml # suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java