From 5ac17b15e172c27f8fcbc7ad3a7115e418c31efa Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 19 Dec 2023 09:07:19 +0800
Subject: [PATCH] update merge

---
 src/components/DialogForm/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index d286ac61..3248ce17 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -143,12 +143,9 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
-<<<<<<< HEAD
 				if (opt.label.includes('(')) {
 					max = max - 3;
 				}
-=======
->>>>>>> projects/mesxc-test
 			}
 		});
 	});