Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/outint/vo/CarOutInRecordPageVo.java

@@ -94,7 +94,7 @@ public class CarOutInRecordPageVo {
      * 手机号码
      */
     @ApiModelProperty("手机号码")
-    private Long phone;
+    private String phone;
     /**
      * 性别
      */