Merge branch 'jtwy' into dev_New

zss

2026-01-19 e02d6b65fae6f05e37f42c66242f05391c4a6d1a

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