github非得让我push才让同步。。
Merge remote-tracking branch 'origin/master'

Conflicts:

	TeamWolf/src/main/java/TeamWolf/TeamWolf/server/stockDATA/StockWrite.java
Merge branch 'master' of https://github.com/TeamColorWolf/Team-Wolf