Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/outint/controller/CarOutInRecordController.java

@@ -66,6 +66,7 @@ public class CarOutInRecordController {
                         .between((ObjectUtil.isNotNull(dto.getStartTime()) && ObjectUtil.isNotNull(dto.getStartTime())), CarOutInRecord::getRecordTime, LocalDateTimeUtil.format(dto.getStartTime(),"yyyy-MM-dd HH:mm:ss"), LocalDateTimeUtil.format(dto.getEndTime(),"yyyy-MM-dd HH:mm:ss"))
                         .eq(ObjectUtil.isNotNull(dto.getCategory()), CarOutInRecord::getCategory, dto.getCategory())
                         .eq(ObjectUtil.isNotNull(dto.getStatus()), CarOutInRecord::getStatus, dto.getStatus())
+                        .like(ObjectUtil.isNotNull(dto.getPlateNumber()), CarOutInRecord::getPlanNo, dto.getPlateNumber())
 
                         .eq(ObjectUtil.isNotNull(dto.getVehicleType()), CarOutInRecord::getVehicleType, dto.getVehicleType())
                         .eq(ObjectUtil.isNotNull(dto.getReleaseReason()), CarOutInRecord::getReleaseReason, dto.getReleaseReason())

src/main/java/com/xjrsoft/module/outint/dto/CarOutInRecordPageDto.java

@@ -70,4 +70,10 @@ public class CarOutInRecordPageDto extends PageInput {
     @ApiModelProperty(" 放行原因 100-固定车放行 101-临时车自动放行 102-预约车自动放行 103-一户多车自动放行")
     private String releaseReason;
 
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty("车牌号")
+    private String plateNumber;
+
 }