From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/momTest.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/momTest.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/momTest.vue
index 9776805..f7ad642 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/momTest.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/MOM/momTest.vue
@@ -158,8 +158,8 @@
<el-form-item label="鐢佃姱鍙�:">
<el-input v-model="input.SerialNo" placeholder="鐢佃姱鍙�" />
</el-form-item>
- <el-form-item label="绌翠綅鍙�:">
- <el-input v-model="input.SlotNo" placeholder="绌翠綅鍙�" />
+ <el-form-item label="閫氶亾鍙�:">
+ <el-input v-model="input.SlotNo" placeholder="閫氶亾鍙�" />
</el-form-item>
<el-form-item label="鐢佃姱缁撴灉:">
<el-input v-model="input.SerialNoResult" placeholder="鐢佃姱缁撴灉" />
--
Gitblit v1.9.3