Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡

云

5 天以前 30ef534fcffe0520bebe7a34abe69d7afbbf227f

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