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

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

@@ -58,6 +58,7 @@ public class CarOutInRecordController {
         IPage<CarOutInRecordPageVo> page = carOutInRecordService.selectJoinListPage(ConventPage.getPage(dto),CarOutInRecordPageVo.class,
                 MPJWrappers.<CarOutInRecord>lambdaJoin()
                         .orderByDesc(CarOutInRecord::getId)
+                        .disableSubLogicDel()
                         .ge(ObjectUtil.isNotNull(dto.getStartTime()),CarOutInRecord::getRecordTime,dto.getStartTime())
                         .le(ObjectUtil.isNotNull(dto.getEndTime()),CarOutInRecord::getRecordTime,dto.getEndTime())
                         .eq(ObjectUtil.isNotNull(dto.getCategory()), CarOutInRecord::getCategory, dto.getCategory())

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

@@ -63,7 +63,7 @@ public class CarOutInRecordPageVo {
     * 人脸照片
     */
     @ApiModelProperty("人脸照片")
-    private Long facePhoto;
+    private String facePhoto;
     /**
     * 进出状态(0:进 1:出)
     */

src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java

@@ -72,6 +72,7 @@ public class CarMessageApplyController {
                 .orderByDesc(CarMessageApply::getId)
                 .disableSubLogicDel()
                 .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
+                .like(StrUtil.isNotBlank(dto.getCarNumber()), CarMessageApply::getCarNumber,dto.getCarNumber())
                 .eq(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getUserName,dto.getUserName())
                 .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
                 .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getStatus,dto.getStatus())

src/main/java/com/xjrsoft/module/personnel/dto/CarMessageApplyPageDto.java

@@ -47,4 +47,10 @@ public class CarMessageApplyPageDto extends PageInput {
      */
     @ApiModelProperty("状态(0:未结束 1:结束)")
     private Integer status;
+
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty("车牌号")
+    private String carNumber;
 }