Merge branch 'develop' into feature/nanxinlin

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartOrderPayView.swift

@@ -98,7 +98,7 @@ class ShoppingCartOrderPayView: BaseView {
         
         tableView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
-            make.bottom.equalTo(selfAddressView.snp_top).offset(-20)
+            make.bottom.equalTo(selfAddressView.snp_top)
         }
     }
     
@@ -161,6 +161,7 @@ class ShoppingCartOrderPayView: BaseView {
         tableView.estimatedRowHeight = 0.000001
         tableView.estimatedSectionFooterHeight = 0.000001
         tableView.estimatedSectionHeaderHeight = 0.000001
+        tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 20, right: 0)
         return tableView
     }()