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

yaowanxin

2025-08-14 2e67b4a6d474c584daf2ab1ff1df9d785f902b96

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