fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html

@@ -98,8 +98,12 @@
                                            </div>
                                        </td>
                                        <td style="width: 200px">
<<<<<<< HEAD
                                            <lightning-formatted-text
                                                style="font-size: 16px"
=======
                                            <lightning-formatted-text style="font-size: 16px;"
>>>>>>> LEXCommunityLiJun
                                                value={coc.Name}
                                            ></lightning-formatted-text>
                                        </td>
@@ -115,8 +119,12 @@
                                            </div>
                                        </td>
                                        <td style="width: 100px">
<<<<<<< HEAD
                                            <lightning-formatted-number
                                                style="font-size: 16px"
=======
                                            <lightning-formatted-number style="font-size: 16px;"
>>>>>>> LEXCommunityLiJun
                                                value={coc.Total_num__c}
                                            ></lightning-formatted-number>
                                        </td>
@@ -132,8 +140,12 @@
                                            </div>
                                        </td>
                                        <td style="width: 100px">
<<<<<<< HEAD
                                            <lightning-formatted-number
                                                style="font-size: 16px"
=======
                                            <lightning-formatted-number style="font-size: 16px;"
>>>>>>> LEXCommunityLiJun
                                                value={coc.OrderNumber_arrived__c}
                                            ></lightning-formatted-number>
                                        </td>
@@ -149,8 +161,12 @@
                                            </div>
                                        </td>
                                        <td style="width: 100px">
<<<<<<< HEAD
                                            <lightning-formatted-number
                                                style="font-size: 16px"
=======
                                            <lightning-formatted-number style="font-size: 16px;"
>>>>>>> LEXCommunityLiJun
                                                value={coc.OrderNumber_notarrive__c}
                                            ></lightning-formatted-number>
                                        </td>
@@ -458,4 +474,8 @@
            </div>
        </div>
    </template>
<<<<<<< HEAD
</template>
=======
</template>
>>>>>>> LEXCommunityLiJun