Merge branch 'master-chw' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -506,6 +506,11 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
     }
 
 
+    public  void  canelReceiveOrder(String  orderNo){
+
+    }
+
+
 
 
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishReceiveMapper.xml

@@ -119,7 +119,7 @@
             <if test="orderNo != null and orderNo != '' ">
                 AND  r.receive_order_no= #{orderNo}
             </if>
-            <if test="status != null  ' ">
+            <if test="status != null ">
                 <choose>
                     <when test=" status == 2">
                         AND  r.status not in (0,1,4)