Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-01-21 9d72eb559e67e3f0bb321198fc562f3cfd9a8625

 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;