Merge remote-tracking branch 'origin/master'

mitao

2 天以前 0d82e9bb89c8569847537f1ce8b9d994bbc4099b

 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;


}