Merge branch 'pim_bhz' into pim_ywx

buhuazhen

7 天以前 93723438fd269d2f602439eabca127ed4054818a

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