Merge branch 'master-rentvehicle' into dev

7f216de1 · jiaorz · 0e9b0ba1 · 48aa00e2 · 7f216de1
Commit 7f216de1 authored Apr 17, 2020 by jiaorz
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BaseOrderController.java ...ava/com/xxfc/platform/order/rest/BaseOrderController.java +1 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
@@ -381,7 +381,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes

        private String phone;
        //违章押金退还状态
-        private Integer validStatus;
+        private Integer refundStatus;

        /**
         * 后台搜索条件：真实姓名