From d6147350809047b8c5d16dac2fcba2e121e4dfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Mon, 30 Jun 2025 16:07:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/web/view/table.vue.tpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 07aaf4162..0a4109165 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -151,7 +151,6 @@
           {{- end }}
         {{- range .Fields}}
           {{- if .Form}}
-<<<<<<< HEAD
             <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
           {{- if .CheckDataSource}}
             <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
@@ -298,7 +297,6 @@ const rule = reactive({
     {{- end }}
 })
 
-<<<<<<< HEAD
 const searchRule = reactive({
   createdAt: [
     { validator: (rule, value, callback) => {