From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/customMydrComp/customMydrComp.html | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/customMydrComp/customMydrComp.html b/force-app/main/default/lwc/customMydrComp/customMydrComp.html
index e57cc8b..778abb0 100644
--- a/force-app/main/default/lwc/customMydrComp/customMydrComp.html
+++ b/force-app/main/default/lwc/customMydrComp/customMydrComp.html
@@ -1,4 +1,5 @@
<template>
+<<<<<<< HEAD
<lightning-input
type="checkbox"
label="浠匨yDr"
@@ -8,3 +9,8 @@
data-field="MyDr"
></lightning-input>
</template>
+=======
+ <lightning-input type="checkbox" label="浠匨yDr" checked={isCheckedMyDr} onchange={dataChange} variant="label-hidden"
+ data-field="MyDr"></lightning-input>
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1