Constant.java
5.23 KB
-
Merge remote-tracking branch 'origin/master' · df1a0adc
# 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
陈浩建 committed