Merge branch 'master-rentvehicle' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

@@ -41,7 +41,8 @@ public class BgOrderListVo {
 	private Integer vehicleCode;
 
 	private Integer userId;
-
+	//押金退还状态
+	private Integer refundStatus;
 	//员工身份
 	private String positionName;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -380,6 +380,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         private Integer type;
 
         private String phone;
+        //违章押金退还状态
+        private Integer validStatus;
 
         /**
          * 后台搜索条件：真实姓名

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -250,6 +250,9 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="validStatus != null">
+                and refundStatus = #{status}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>