Merge branch 'dev_New' into yhdq

zss

2026-02-06 6736f86877f48652ea1ba6ab892d3ff4845e6b7c

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