Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

2026-01-10 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

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