fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -200,6 +200,7 @@
                            style="word-wrap: break-word; word-break: break-all"
                        >
                        </lightning-datatable>
<<<<<<< HEAD
                        <c-paginator
                            onprevious={handlePrevious}
                            onnext={handleNext}
@@ -213,6 +214,13 @@
                            record-end={recordEnd}
                            total-records={totalRecords}
                        ></c-paginator>
=======
                        <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
                            onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions} default-page-size={pageSize}
                            previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
                            record-start={recordStart} record-end={recordEnd}
                            total-records={totalRecords}></c-paginator>
>>>>>>> LEXCommunityLiJun
                    </div>
                    <!-- </template> -->
                </div>