From d5d3d4e6397f23782958748f46c389b85eaafe47 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 20 Aug 2021 14:28:43 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
index bef684f..eb8abf4 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
@@ -150,7 +150,7 @@
         layer.confirm('确定取消此订单?', {
                 btn: ['确认', '取消'] //可以无限个按钮
             }, function(index, layero){
-                $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
+                $.post(basePath+'/admin/order/erpCancelOrder?id='+id+'&del=0', {}, function(data){
                     if (data.status == '200') {
                         parent.layer.msg(data.info,{icon: 1});
                     } else {

--
Gitblit v1.9.1