Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 829392f5e6ff4492fb40769d2ea09552a07aa2ad

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

@@ -66,7 +66,7 @@
            return ResultData.success();
          }
          else
            return  ResultData.error();
              return  ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
    }