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

liyong

2026-01-15 5bea250f3d53b289e10d920ffd46aa6a0002cb7d

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