Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 937e0e7a3c06aea55d42350268c1aba8e3264eb3

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

@@ -74,5 +74,12 @@
    private Long delFlag;


    /**
     * 机构ID
     */
    @ApiModelProperty("院区")
    @Excel(name = " 院区 ")
    private String campusid;

}