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/lexArriveGoodsMain/lexArriveGoodsMain.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
index f7572d2..47a5f09 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
@@ -526,4 +526,8 @@
// });
// this.dispatchEvent(evt);
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1