fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/lwc/lexTopPage/lexTopPage.js

@@ -650,6 +650,7 @@
    editProductLimit(event) {
        //add by Wang Xueqin 2023/05/05
        //let url =
<<<<<<< HEAD
        // '/LexProductLimitEdit?accountid=' +
        // this.accountId +
        // '&userPro_Type=' +
@@ -659,6 +660,13 @@
            this.accountId +
            '&userPro_Type=' +
            this.userPro_Type;
=======
            // '/LexProductLimitEdit?accountid=' +
            // this.accountId +
            // '&userPro_Type=' +
            // this.userPro_Type;
        let url = "/lexproductlimitedit?accountid=" + this.accountId + "&userPro_Type=" + this.userPro_Type;
>>>>>>> LEXCommunityLiJun
        const config = {
            type: 'standard__webPage',
            attributes: {
@@ -797,4 +805,8 @@
    get nextButtonDisabled() {
        return this.nextPageToken === undefined;
    }
<<<<<<< HEAD
}
=======
}
>>>>>>> LEXCommunityLiJun