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

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

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