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/beautySalon/yypb-form.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
index a01f2d8..5723d51 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
@@ -122,7 +122,7 @@
                                     </tr>
 
                                     <tr v-for="(item,index) in projService.serviceItems">
-                                        <td>{{item.projInfo.name}}</td>
+                                        <td>{{item.projInfo.name}}【{{item.projUse.source}}】</td>
                                         <td>{{item.count}}</td>
                                         <td>{{item.projUse.price * item.count}}</td>
                                         <td><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>

--
Gitblit v1.9.1