Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -10,7 +10,7 @@ namespace GFGEditor
         /// 存放excel表文件夹的的路径
         /// </summary>
         //public const string excelsFolderPath = "../../../gfg/tools/Config";
-        public static string excelsFolderPath { get { return $"../../../gfg/tools/{excelsRootDirNameDressUp}/"; } }
+        public static string excelsFolderPath { get { return $"../../../gfg/tools/{excelsRootDirNameDressUp}/data/"; } }
         /// <summary>
         /// 存放临时excel表文件夹的的路径
         /// </summary>