# Conflicts: # common/src/main/java/com/winsun/bean/UniversityInfo.java # common/src/main/java/com/winsun/constant/Constant.java # common/src/main/java/com/winsun/mapper/UniversityInfoMapper.java
