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/lexCustomInventoryColor/lexCustomInventoryColor.html | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html b/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
index 0f067e2..91fe24f 100644
--- a/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
+++ b/force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html
@@ -1,6 +1,7 @@
<template>
<template if:true={showNormal}>
<div
+<<<<<<< HEAD
style="
margin-left: 10px;
margin-right: 10px;
@@ -14,10 +15,15 @@
<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;
@@ -32,10 +38,15 @@
<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;
@@ -53,3 +64,10 @@
</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