Merge remote-tracking branch 'origin/master' into pim-qiao

青城

2025-07-09 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18

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