From aafd58ca236ea5f9b66d9759121053c16fb87fe6 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 11 Sep 2021 17:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
index 185869e..021105c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
@@ -976,7 +976,7 @@
                     title: "打印订单",
                     area: ['250px', '550px'],
                     maxmin: true,
-                    content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
+                    content: [basePath + '/admin/order/printOrder?id=' + id]
                 });
             },
             handleClick() {

--
Gitblit v1.9.1