Merge branch 'jtwy' into dev_New

zss

2026-01-12 645fe0426017b280aa107b9363d37dc85470601b

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