Merge branch 'master' of https://gitee.com/op-souls/ghy-all

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -287,6 +287,15 @@ public class OrderMasterController extends BaseController {
         return toAjax(orderMasterService.updateOrderMaster(orderMaster));
     }
 
+    /**
+     * 修改保存主订单信息
+     */
+    @PostMapping("/editOrderMaster")
+    @ResponseBody
+    public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) {
+        return toAjax(orderMasterService.updateOrderMaster(orderMaster));
+    }
+
     /**
      * 校验主订单编码
      */