Merge branch 'dev_New' into jtwy

zss

2026-02-05 8d41b81fa9570be2baf29a1251751047266b149d

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