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

zss

2026-03-06 5ea995912d4134f2027a3ddb566718f56d979261

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