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/customMydrComp/customMydrComp.js | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/lwc/customMydrComp/customMydrComp.js b/force-app/main/default/lwc/customMydrComp/customMydrComp.js
index 35ef793..53ff28f 100644
--- a/force-app/main/default/lwc/customMydrComp/customMydrComp.js
+++ b/force-app/main/default/lwc/customMydrComp/customMydrComp.js
@@ -1,16 +1,32 @@
-import { LightningElement, track, api } from "lwc";
+<<<<<<< HEAD
+import { LightningElement, track, api } from 'lwc';
+=======
+import { LightningElement,track,api } from 'lwc';
+>>>>>>> LEXCommunityLiJun
export default class CustomMydrComp extends LightningElement {
- @api recordId;
- @api isCheckedMyDr;
+ @api recordId;
+ @api isCheckedMyDr;
- connectedCallback() {
- console.log("this.recordId = " + this.recordId);
- console.log("this.isCheckedMyDr = " + this.isCheckedMyDr);
- }
+<<<<<<< HEAD
+ connectedCallback() {
+=======
+ connectedCallback(){
+>>>>>>> LEXCommunityLiJun
+ console.log('this.recordId = ' + this.recordId);
+ console.log('this.isCheckedMyDr = ' + this.isCheckedMyDr);
+ }
- dataChange(event) {
- this.isCheckedMyDr = event.target.checked;
- console.log("this.isCheckedMyDr = " + this.isCheckedMyDr);
- }
+<<<<<<< HEAD
+ dataChange(event) {
+ this.isCheckedMyDr = event.target.checked;
+ console.log('this.isCheckedMyDr = ' + this.isCheckedMyDr);
+ }
}
+=======
+ dataChange(event){
+ this.isCheckedMyDr = event.target.checked;
+ console.log('this.isCheckedMyDr = ' + this.isCheckedMyDr);
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1