Merge remote-tracking branch 'origin/master'

zhs

9 天以前 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java

@@ -37,6 +37,7 @@
    @ApiModelProperty("部门类型")
    @Excel(name = "部门类型   1:科室   2:病区")
    private String deptType;

    private String guid;

    /**