Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

GameConfig/CFG.check

@@ -2,7 +2,7 @@
 D:\git\newWork\Config\GameConfig\M_monster.xls:717434001
 D:\git\newWork\Config\GameConfig\M_i18n.xls:-314618994
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:821085365
-D:\git\newWork\Config\GameConfig\M_music.xls:-1600470119
+D:\git\newWork\Config\GameConfig\M_music.xls:559991838
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:1313859929
 D:\git\newWork\Config\GameConfig\M_avatar.xls:-1243852077
 D:\git\newWork\Config\GameConfig\M_equipment.xls:1464015089