Merge branch 'feature/merchant-info-edit' of...

Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant

src/pages/orderManage/pendingDeliveryOrder/index.less

@@ -48,13 +48,13 @@
   }
 }
 .btnWarning {
-  background-color: rgb(247, 143, 74);
-  border-color: rgb(247, 143, 74);
+  background-color: rgb(247, 143, 74) !important;
+  border-color: rgb(247, 143, 74) !important;
 }
 .btnWarning:hover,
 .btnWarning:focus {
-  background-color: rgb(253, 168, 111);
-  border-color: rgb(253, 168, 111);
+  background-color: rgb(253, 168, 111) !important;
+  border-color: rgb(253, 168, 111) !important;
 }
 
 .tableList {