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

lidongdong

2022-11-10 3c0486f18c3936102bc46021cf994647f17e5fe9

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

@@ -432,8 +432,8 @@
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
//            ids=new ArrayList<>();
//            ids.add(sysUser.getDepartmentId());
        }
        else
        {