From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html b/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
index 91fe24f..0f067e2 100644
--- a/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
+++ b/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
@@ -1,7 +1,6 @@
<template>
<template if:true={showNormal}>
<div
-<<<<<<< HEAD
style="
margin-left: 10px;
margin-right: 10px;
@@ -15,15 +14,10 @@
<lightning-formatted-number
value={value}
></lightning-formatted-number>
-=======
- style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;text-align: right;padding-right:10px;">
- <lightning-formatted-number value={value}></lightning-formatted-number>
->>>>>>> LEXCommunityLiJun
</div>
</template>
<template if:true={showRed}>
<div
-<<<<<<< HEAD
style="
margin-left: 10px;
margin-right: 10px;
@@ -38,15 +32,10 @@
<lightning-formatted-number
value={value}
></lightning-formatted-number>
-=======
- style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;background-color:red;text-align: right;padding-right:10px;">
- <lightning-formatted-number value={value}></lightning-formatted-number>
->>>>>>> LEXCommunityLiJun
</div>
</template>
<template if:true={showYellow}>
<div
-<<<<<<< HEAD
style="
margin-left: 10px;
margin-right: 10px;
@@ -64,10 +53,3 @@
</div>
</template>
</template>
-=======
- style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;background-color:yellow;text-align: right;padding-right:10px;">
- <lightning-formatted-number value={value}></lightning-formatted-number>
- </div>
- </template>
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1