Merge remote-tracking branch 'origin/master'

mitao

昨天 bdd967acce69d2420d9866789dfcee42c7e77023

 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;


}