From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/customMydrComp/customMydrComp.js | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/lwc/customMydrComp/customMydrComp.js b/force-app/main/default/lwc/customMydrComp/customMydrComp.js
index 53ff28f..9e58427 100644
--- a/force-app/main/default/lwc/customMydrComp/customMydrComp.js
+++ b/force-app/main/default/lwc/customMydrComp/customMydrComp.js
@@ -1,32 +1,16 @@
-<<<<<<< HEAD
import { LightningElement, track, api } from 'lwc';
-=======
-import { LightningElement,track,api } from 'lwc';
->>>>>>> LEXCommunityLiJun
export default class CustomMydrComp extends LightningElement {
@api recordId;
@api isCheckedMyDr;
-<<<<<<< HEAD
connectedCallback() {
-=======
- connectedCallback(){
->>>>>>> LEXCommunityLiJun
console.log('this.recordId = ' + this.recordId);
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