Merge remote-tracking branch 'origin/master'

fangyuan

2022-11-28 7be8ccdf0f6f2b4790a2b639694b225c2765a38c

 ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java

@@ -28,4 +28,7 @@
    @ApiModelProperty("部门类型")
    private String departTypeName;

    @ApiModelProperty("父部门")
    private String parentDepartName;

}