From 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 16:45:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 6483229..35fe872 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -1350,7 +1350,7 @@
                         title: "打印订单",
                         area: ['250px', '550px'],
                         maxmin: true,
-                        content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
+                        content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
                         cancel: function (index, layero) {
                             _this.closeFram();
                         }

--
Gitblit v1.9.1