Merge remote-tracking branch 'origin/master'

maven

2025-10-21 3240968279b2960b05071db0ac4e950955a69dfd

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