Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 Wms/Model/ModelDto/SysDto/CustomerDto.cs

@@ -18,7 +18,7 @@
        public string CustomerName { get; set; }

        /// <summary>
        /// 类型 0 销售客户/货主  1 供货商
        /// 类型 0 销售客户 1 供货商 2：货主
        /// </summary>           
        public int? Type { get; set; }