Merge remote-tracking branch 'origin/hckx' into hckx

maven

2025-12-16 da5094f2b971076db2b09faf78ee6fc65e35f7c7

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