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

liyong

2026-01-06 ded338d0bafa5594b275edb81a8f69ea4446c37c

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