From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/tEnquiry/tEnquiry.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/tEnquiry/tEnquiry.html b/force-app/main/default/lwc/tEnquiry/tEnquiry.html
index 46f13e5..c620a8b 100644
--- a/force-app/main/default/lwc/tEnquiry/tEnquiry.html
+++ b/force-app/main/default/lwc/tEnquiry/tEnquiry.html
@@ -45,7 +45,7 @@
<!-- <div style="width: 450px;float: left;margin-left: 10px;"> -->
<!-- <c-jzlookupv3 data-parent-id="lookup1" label="鍏宠仈鍖婚櫌" placeholder="璇烽�夋嫨鍏宠仈鍖婚櫌.." onsearchchange={onsearchchange} searchdata={searchdata} option={option} onselected={selectedFn}> </c-jzlookupv3> -->
- <c-jzlookuplightning data-parent-id="lookup1" onsearchchange={onsearchchange1} objectname="Tender_information__c" fieldname="Hospital__c" > </c-jzlookuplightning>
+ <c-jzlookuplightning data-parent-id="lookup1" onsearchchange={onsearchchange1} objectname="Tender_information__c" fieldname="Hospital__c" > </c-jzlookuplightning>
</div>
--
Gitblit v1.9.1