Merge branch 'dev' into pre

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

@@ -128,7 +128,7 @@ public class FaceManagementController {
             MPJLambdaWrapper<StundentFaceProcess> queryWrapper = new MPJLambdaWrapper<>();
             queryWrapper.eq(StundentFaceProcess::getUserId, faceManagement.getUserId())
                     .eq(StundentFaceProcess::getFacePhoto, faceManagement.getFileId())
-                    .eq(TeacherFaceProcess::getDeleteMark, 0)
+                    .eq(StundentFaceProcess::getDeleteMark, 0)
 //                    .eq(StundentFaceProcess::getStatus, 1)
             ;
             StundentFaceProcess stundentFaceProcess = stundentFaceProcessService.getOne(queryWrapper);