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

lidongdong

2022-10-24 8231f0815ac5e96424bca9db1912fa2cb8953c14

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

@@ -178,8 +178,10 @@
        {
            return error("该人员有工单未处理完不能删除");
        }

        return toAjax(IUserService.deleteConfigById(userId));
        SysUser user=IUserService.selectData(userId,null,null);
        user.setUserType("3");
        user.setRoleIds("3");
        return toAjax(IUserService.updateConfig(user));
    }

    /**