From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg
---
force-app/main/default/lwc/lexTopPage/lexTopPage.js | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.js b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
index 972ef65..88ffbbb 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.js
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
@@ -650,7 +650,6 @@
editProductLimit(event) {
//add by Wang Xueqin 2023/05/05
//let url =
-<<<<<<< HEAD
// '/LexProductLimitEdit?accountid=' +
// this.accountId +
// '&userPro_Type=' +
@@ -660,13 +659,6 @@
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: {
@@ -805,8 +797,4 @@
get nextButtonDisabled() {
return this.nextPageToken === undefined;
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1