From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 admin/src/components/business/backGoodsorderWindow.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/business/backGoodsorderWindow.vue b/admin/src/components/business/backGoodsorderWindow.vue
index 6579b5f..cb98785 100644
--- a/admin/src/components/business/backGoodsorderWindow.vue
+++ b/admin/src/components/business/backGoodsorderWindow.vue
@@ -7,10 +7,10 @@
     @confirm="confirm"
   >
     <el-descriptions title="" :column="2" >
-      <el-descriptions-item label="鍏呭�兼娂閲�">{{ form.goodsorderMoney }}</el-descriptions-item>
-      <el-descriptions-item label="缁撶畻閲戦">{{ form.closeMoney }}</el-descriptions-item>
-      <el-descriptions-item label="宸查��閲戦">{{ form.hasRefundMoney }}</el-descriptions-item>
-      <el-descriptions-item label="鍙��閲戦">{{ form.canBanlanceMoney }}</el-descriptions-item>
+      <el-descriptions-item label="鍏呭�兼娂閲�">{{ form.goodsorderMoney }}鍏�</el-descriptions-item>
+      <el-descriptions-item label="缁撶畻閲戦">{{ form.closeMoney }}鍏�</el-descriptions-item>
+      <el-descriptions-item label="宸查��閲戦">{{ form.hasRefundMoney }}鍏�</el-descriptions-item>
+      <el-descriptions-item label="鍙��閲戦">{{ form.canBanlanceMoney }}鍏�</el-descriptions-item>
     </el-descriptions>
     <el-form :model="form" ref="form" :rules="rules" label-suffix="锛�">
       <el-form-item label="閫�娆鹃噾棰�" prop="money">

--
Gitblit v1.9.3