Merge branch 'master' into pim_meet

buhuazhen

9 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java

@@ -12,4 +12,6 @@
public class SysUserDeptVo extends SysUserDept {

    private String deptName;

    private String userName;
}