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/customAccountUrlComp/customAccountUrlComp.js | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
index 7b8bb35..b175148 100644
--- a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
+++ b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.js
@@ -1,15 +1,29 @@
+<<<<<<< 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);
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1