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

zss

昨天 599b5ff692722226d1e30fbdffc594b826bfa815

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