Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

WebTest/MainWindow.xaml.cs

@@ -143,12 +143,12 @@ private string registerName = "webContext";
                 //globalContext.User.ShopList = shopList;
 
 
-                IList<Department> departmentList = null;
+                IList<Department> departmentList = allDepartmentList;
 
                 //var response = mdsApiService.GetShopDetailList();
                 //if (!response.Success)
                 //    throw new Exception(response.Msg);
-                departmentList = allDepartmentList?.Where(d => d.Name.Contains("供应链")).ToList();
+                //departmentList = allDepartmentList?.Where(d => d.Name.Contains("供应链")).ToList();
                 if (departmentList.Count == 0)
                     throw new Exception("缺少有效的部门数据");