Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java

@@ -58,7 +58,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
     public IPage<InspectionResponse> pageByCondition(InspectionRequest request) {
         //总经理查询所有年检任务
         if (CommonEnum.DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
-            request.setUserId(null);
+            request.setUserId(0L);
         }
         return baseMapper.pageByCondition(request.getPage(), request);
     }