Merge remote-tracking branch 'origin/master'

fuliqi

2023-11-30 e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0

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

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

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

}