From 9a341d58bf0cfc4d9c0b9be745671f4e5c490b02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 20 Jul 2021 14:29:51 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
index 1e77049..82b63d7 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
@@ -180,7 +180,7 @@
                     title: "打印服务单",
                     area: ['250px', '550px'],
                     maxmin: true,
-                    content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+                    content: [basePath + '/admin/projService/printOrder?id=' + id]
                 });
             },
             toBack() {
@@ -205,7 +205,7 @@
             title: "打印服务单",
             area: ['250px', '550px'],
             maxmin: true,
-            content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+            content: [basePath + '/admin/projService/printOrder?id=' + id]
         });
     }
 

--
Gitblit v1.9.1