Merge remote-tracking branch 'origin/master'

FullCardClient/src/main/java/com/zhongshu/card/client/model/attendance/LeaveApprovalModel.java

@@ -44,18 +44,28 @@ public class LeaveApprovalModel {
     //审核状态
     private LeaveStatus leaveStatus;
 
+    //审核状态信息
+    private String leaveStatusStr;
+
     @Schema(description = "是否显示警告红点")
     private Boolean isWarning = Boolean.FALSE;
 
     public Boolean getIsWarning() {
         if (leaveStatus != null) {
-            if (leaveStatus == LeaveStatus.Wait) {
+            if (leaveStatus != LeaveStatus.Pass) {
                 return Boolean.TRUE;
             }
         }
         return Boolean.FALSE;
     }
 
+    public String getLeaveStatusStr() {
+        if (leaveStatus != null) {
+            return leaveStatus.getRemark();
+        }
+        return null;
+    }
+
     private Long approvalTime;
 
     //审核意见