Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder

AllBase/BaseClass.cs

@@ -37,7 +37,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 338;
+        public static int VersionCount = 350;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";

AllBase/Helper/GlobalConfig.cs

@@ -20,10 +20,10 @@ namespace AllBase.Helper
 {
     public class GlobalConfig
     {
-        /// <summary>
-        /// 颜色等图形元素需要在主线程操作
-        /// </summary>
-        public static Dispatcher Dispatcher { get; set; }
+		/// <summary>
+		/// 颜色等图形元素需要在主线程操作
+		/// </summary>
+		public static Dispatcher Dispatcher { get; set; }
         /// <summary>
         /// 店铺列表
         /// </summary>