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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -134,7 +134,6 @@
        {
            if(sysStreet!=null&&sysStreet.getId()!=null)
            {
                ids.add(sysStreet.getId()+"");
                if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
                {
                    ids.addAll(disposestreetId(sysStreet.getChild()));