From ebb4fa8dad778cc663726668698cc90f7bf0d8e6 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 14:25:03 +0800
Subject: [PATCH] 冲突解决
---
src/views/mainPlan/platePlanList/index.vue | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index a5ca6a5..0d50ddf 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -171,19 +171,11 @@
field: "documentNumber",
width: 200,
},
-<<<<<<< HEAD
- {
- title: "褰撳墠宸ュ簭鍙�",
- field: "currentProcessNumberTxt",
- width: 150,
- },
-=======
// {
// title: "褰撳墠宸ュ簭鍙�",
// field: "processNumber",
// width: 150,
// },
->>>>>>> 8c613f17337c8e7fc68a12d02cafa05d0dca81ba
{
title: "闇�姹傚垎绫�",
field: "requirementType",
--
Gitblit v1.9.3