From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
index 3126f80..c1f81ad 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
@@ -138,7 +138,7 @@
         layer.confirm('确定取消此订单?', {
             btn: ['确认', '取消'] //可以无限个按钮
         }, function(index, layero){
-            $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
+            $.post(basePath+'/admin/projService/erpCancelOrder?id='+id, {}, function(data){
                 parent.layer.msg(data.info,{icon: 1});
                 layer.closeAll();
                 myGrid.serchData();

--
Gitblit v1.9.1