From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

---
 src/views/product/workbench/workstationoperate-form.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/views/product/workbench/workstationoperate-form.vue b/src/views/product/workbench/workstationoperate-form.vue
index 2ded8dd..3c6345d 100644
--- a/src/views/product/workbench/workstationoperate-form.vue
+++ b/src/views/product/workbench/workstationoperate-form.vue
@@ -1,5 +1,6 @@
 <template>
   <div style="width: 100%;height: 100%"></div>
+
 </template>
 <style lang="scss" scoped>
 .ws-header {

--
Gitblit v1.9.3