Merge remote-tracking branch 'origin/master'

heheng

20 小时以前 c6901af945ffbabafb4d50f39d2beb3b6a4af677

 multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java

@@ -27,7 +27,7 @@
    private Long deptId;

    /** 父部门ID */
    @ApiModelProperty("主要负责部门ID")
    @ApiModelProperty("主要负责部门ID作废")
    private Long parentId;

    /** 祖级列表 */
@@ -76,7 +76,13 @@

    @ApiModelProperty("部门职责")
    private String responsibilities;
    


    @ApiModelProperty("部门类型1默认2管理")
    private String deptType;

    @ApiModelProperty("是否职能分配1是2否")
    private String responsType;
    /** 子部门 */
    private List<SysDept> children = new ArrayList<SysDept>();

@@ -245,4 +251,20 @@
    public void setInternalAuditorsName(String internalAuditorsName) {
        this.internalAuditorsName = internalAuditorsName;
    }

    public String getDeptType() {
        return deptType;
    }

    public void setDeptType(String deptType) {
        this.deptType = deptType;
    }

    public String getResponsType() {
        return responsType;
    }

    public void setResponsType(String responsType) {
        this.responsType = responsType;
    }
}