Conflicts: src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/controller/TeacherCongressInstitutionController.java src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/basicTable.js src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/index.html