Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 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