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

lidongdong

2022-11-10 3c0486f18c3936102bc46021cf994647f17e5fe9

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -179,8 +179,8 @@
            return error("该人员有工单未处理完不能删除");
        }
        SysUser user=IUserService.selectData(userId,null,null);
        user.setUserType("3");
        user.setRoleIds("3");
        user.setUserType("4");
        user.setRoleIds("4");
        return toAjax(IUserService.updateConfig(user));
    }