Merge branch 'dev_New' into dev_New_kthg

zss

2026-02-06 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

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