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/lexTopPage/lexTopPage.js | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.js b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
index 7ecdcc9..972ef65 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.js
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
@@ -650,11 +650,23 @@
editProductLimit(event) {
//add by Wang Xueqin 2023/05/05
//let url =
+<<<<<<< HEAD
+ // '/LexProductLimitEdit?accountid=' +
+ // this.accountId +
+ // '&userPro_Type=' +
+ // this.userPro_Type;
+ let url =
+ '/lexproductlimitedit?accountid=' +
+ 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: {
@@ -793,4 +805,8 @@
get nextButtonDisabled() {
return this.nextPageToken === undefined;
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1