fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
<template>
    <template if:true={showNormal}>
        <div
<<<<<<< HEAD
            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>
=======
            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;
                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>
=======
            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;
                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>
=======
            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