Merge remote-tracking branch 'origin/master'

mitao

1 天以前 bdd967acce69d2420d9866789dfcee42c7e77023

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

@@ -48,14 +48,14 @@
    @ApiModelProperty(value = "申请人")
    @TableField("applicant_name")
    private String applicantName;

    @ApiModelProperty(value = "所属部门")
    @TableField("dept_name")
    private String deptName;
    @ApiModelProperty(value = "部门ID")
    @TableField("dept_id")
    private Integer deptId;

    @ApiModelProperty(value = "所属部门")
    @TableField("dept_name")
    private String deptName;


    @ApiModelProperty(value = "申请日期")
    @TableField("application_date")