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

GameConfig/package.json

@@ -6,6 +6,6 @@
     "xlsx": "^0.18.5"
   },
   "scripts": {
-    "gen:pojo": "node gen_pojo_from_xls_json.js \"D:/project/FishConfig/GameConfig/json\" \"D:/project/FishConfig/GameConfig\" vip.metadev.module.business.pogo \"D:/project/game-framework/game-module-business/src/main/java\""
+    "gen:pojo": "node gen_pojo_from_xls_json.js \"D:/project/FishConfig/GameConfig/json\" \"D:/project/FishConfig/GameConfig\" vip.metadev.module.business.pojo \"D:/project/game-framework/game-module-business/src/main/java\""
   }
 }