Merge branch 'dev_New' into pcdz

zss

2026-02-06 7df528176008256c3b177526274f89d391c61526

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