Merge branch 'dev_New' into jtwy

zss

2026-02-06 7c2e63f3b9d4495230fab35562fe1bed628133a9

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