Merge remote-tracking branch 'origin/master'

mitao

3 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java

@@ -60,5 +60,9 @@
    @TableField("leave_approval_application_id")
    private Integer leaveApprovalApplicationId;

    @ApiModelProperty(value = "是否是请假申请 0否1是")
    @TableField("is_leave")
    private Boolean isLeave;


}