Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-06 6c84eff9302df57bc41a5200c2f88f67b669c460

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

@@ -245,7 +245,7 @@
                wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
            }
            else if (order.getSubmitType().equals(2)){
                smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            order.setState("4");
            entity.setState("7");