Merge remote-tracking branch 'origin/master'

fuliqi

2024-01-09 ebb1a448339bafc4c4849fdbc2291bd3a28261df

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

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

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

}