Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 201518a621d0d5f3c2040217950b10a5eaba22e6

 ruoyi-system/src/main/java/com/ruoyi/system/vo/system/LeaveListVO.java

@@ -23,5 +23,5 @@
    @ApiModelProperty("部门类型 前端忽略")
    private Integer deptType;
    @ApiModelProperty("部门id 前端忽略")
    private Integer deptId;
    private String deptId;
}