Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-18 acea9131318ee6823d008b386e52fee573882b2e

 ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java

@@ -19,7 +19,7 @@
    private String departTypeName;

    @ExcelProperty(value = "部门类型", index = 2)
    private Integer departType;
    private String departType;

    @ExcelProperty(value = "上级部门", index = 3)
    private String parentDepartName;