Merge branch 'jtwy' into dev_New

zss

2026-01-19 2ca1553e619071c3ae67421fb1e7aa298f8cfce0

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