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

yaowanxin

2025-08-11 0d564acb20296f5f289d0fedfc1b09ef421892a3

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