Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

2 天以前 ee672b09c79e13e45ddc719f8780188fd196ac0a

 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;
}