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

yanghui

2022-11-28 0b643d15ab435b06f5fd2adccaca83621fd025de

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

@@ -210,7 +210,10 @@
            if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
                config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
            else
            {
                config.setDataPermission("0");
            }

             config.setRoleIds("13");
        }
        else