Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

zouyu

2026-01-10 0fcc6eb314fafab572def73100584d353089ee8c

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