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/customAccountUrlComp/customAccountUrlComp.js | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
index b175148..f7c9bad 100644
--- a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
+++ b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
@@ -1,29 +1,15 @@
-<<<<<<< HEAD
import { LightningElement, api } from 'lwc';
-=======
-import { LightningElement,api } from 'lwc';
->>>>>>> LEXCommunityLiJun
export default class CustomAccountUrlComp extends LightningElement {
@api accountName;
@api accountUrl;
@api isDisable;
-<<<<<<< HEAD
connectedCallback() {
console.log('zhj');
console.log('杩涘叆CustomAccountUrlComp');
-=======
- connectedCallback(){
- console.log('zhj')
- console.log('杩涘叆CustomAccountUrlComp')
->>>>>>> LEXCommunityLiJun
console.log('accountName = ' + this.accountName);
console.log('accountUrl = ' + this.accountUrl);
console.log('isDisable = ' + this.isDisable);
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1