Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-09 dc0285dcb1695f8f7b69b09bc6dcd4e3e9ba4173

 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("4");
        user.setRoleIds("4");
        return toAjax(IUserService.updateConfig(user));
    }

    /**