Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-06 a6f51ccae4bc650247d07838da97787d5302f1f8

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