合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -395,7 +395,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         if(userId!=null){
             Optional<User> optional = pasUserDao.findById(userId);
             if(optional.isPresent()){
-                workoverAppro.setAuditId(optional.get().getUsername());
+                workoverAppro.setAuditName(optional.get().getUsername());
             }
         }
         return workoverApproDao.save(workoverAppro);