Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-07 6247ee93e0e1fde3592ec268472e94589e3f651f

Merge branch 'zigonggao_dev' into huacheng_test

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

@@ -243,6 +243,7 @@
                }
                SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
                wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            else if (order.getSubmitType().equals(2)){
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());