解决合并冲突

47fc0c86 · 周健威 · 514e5960 · 47fc0c86
Commit 47fc0c86 authored Jun 25, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

VehiclePageQueryVo.java ...va/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java +1 -0

No files found.
--- a/xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java
+++ b/xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java
@@ -128,4 +128,5 @@ public class VehiclePageQueryVo {
     */
    private Integer haveViolation;

+
 }