Merge branch 'dev_dh_fourSpirit2' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
commit
51d3d8bf2d
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java