Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941

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

@@ -38,7 +38,7 @@
    @TableField("audit_status")
    private Integer auditStatus;

    @ApiModelProperty(value = "审批人id和抄送人id，逗号拼接")
    @ApiModelProperty(value = "抄送人id和审批人id，逗号拼接")
    @TableField("audit_id")
    private String auditId;