Merge branch 'jtwy' into dev_New

zss

2026-01-20 e620584c3286579a7f89ff73d227f58d721d6798

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