diff --git a/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate b/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
index 223bbac8780e06d10579906ef422f84c4150fa26..2da923f03252c13fef8ce937263b26a64184a6a9 100644
Binary files a/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate and b/GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseListModel.swift b/GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseListModel.swift
index 573571fee88372e7d939e6c31c0d912af8ca04b4..7011e1a4c1654084772846b60b20f47d698d6166 100644
--- a/GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseListModel.swift
+++ b/GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseListModel.swift
@@ -37,7 +37,7 @@ class ShopWarehouseListDataModel: Mappable {
     var contact_number : String? //库存总数联系电话
     var mail : String? //库存总数电子邮箱
     var position_count : Int? //库存总数库位数量(统计用)
-    var is_default : Bool? //库存总数是否为默认
+    var is_default : Int? //库存总数是否为默认
     var inventory_count : Int? //库存总数
     
     required init?( map: Map) {
diff --git "a/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementCell.xib" "b/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementCell.xib"
index d7bb968a743c068f4fc45a2d8cc66306efa1b384..bba30cc7cd202801aed0fe6a971022da0baeff4c 100644
--- "a/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementCell.xib"
+++ "b/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementCell.xib"
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git "a/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementListVC.swift" "b/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementListVC.swift"
index bce9a82b3f87fc33d84259d92bdf20af2824435a..b9c0a913da5fa2303e2d18f1cc9e817b07fb062f 100644
--- "a/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementListVC.swift"
+++ "b/GeliBusinessPlatform/ViewController/\344\273\223\345\272\223\347\256\241\347\220\206/WarehoseMangementListVC.swift"
@@ -204,27 +204,38 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         cell.statusLbl.text = typeArr[model.w_type!]
         cell.statusLbl.isHidden = false
         cell.adrLbl.text = model.w_address!
-        cell.kuCunLbl.text = "库存位" + StringByInt(number: model.position_count!)
-        switch model.w_type {
-        case 0:
-            //异常
-            cell.statusLbl.isHidden = true
-            break
-        case 1:
-            cell.statusLbl.backgroundColor = UIColor(named: "标题背景色")
-            cell.statusLbl.alpha = 1
-            break
-        case 2:
-            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
-            cell.statusLbl.alpha = 0.5
-            break
-        case 3:
+        cell.kuCunLbl.text = "库存位" + StringByInt(number: model.position_count!) + "  " + "总库存数：" + StringByInt(number: model.inventory_count!)
+        
+        if model.is_default! == 1  {
+            cell.statusLbl.isHidden = false
             cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
             cell.statusLbl.alpha = 1
-            break
-        default:
-            break
+            cell.statusLbl.text = "默认"
+        }else{
+            cell.statusLbl.isHidden = true
         }
+        
+        //仓库管理→仓库列表，没有选择“仓库类型”的仓库，不要显示任何“仓库类型标签”，现在是会显示“常温”。
+//        switch model.w_type {
+//        case 0:
+//            //异常
+//            cell.statusLbl.isHidden = true
+//            break
+//        case 1:
+//            cell.statusLbl.backgroundColor = UIColor(named: "标题背景色")
+//            cell.statusLbl.alpha = 1
+//            break
+//        case 2:
+//            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
+//            cell.statusLbl.alpha = 0.5
+//            break
+//        case 3:
+//            cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
+//            cell.statusLbl.alpha = 1
+//            break
+//        default:
+//            break
+//        }
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
diff --git "a/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\345\210\227\350\241\250/OrderListVC.swift" "b/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\345\210\227\350\241\250/OrderListVC.swift"
index d339fe6fd68df7173826331fed8fd66f78245784..d5799d70796d9f313102af56dd4b278dc0d219bf 100644
--- "a/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\345\210\227\350\241\250/OrderListVC.swift"
+++ "b/GeliBusinessPlatform/ViewController/\350\256\242\345\215\225\345\210\227\350\241\250/OrderListVC.swift"
@@ -192,8 +192,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         if rowModel.order_status != nil && rowModel.order_status_d != nil && rowModel.goods_before_pay != nil {
             cell.statusLbl.text = orderStatusStrByInt(statusNumber: rowModel.order_status!, status_d: rowModel.order_status_d!, isBfPay: rowModel.goods_before_pay!, LmIdx: orderStatus)
         }
-        
-        cell.countLbl.text = "\(rowModel.goods_number!)"
+        if rowModel.goods_number != nil {
+            cell.countLbl.text = "\(rowModel.goods_number!)"
+        }
         cell.priceLbl.text = rowModel.sum_amount
         cell.timeLbl.text = TimeByDouble(sender: rowModel.add_time!)