Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -681,10 +681,7 @@
                                onfirst={goFirstPage}
                                onlast={goLastPage}
                                page-size-options={pageSizeOptions}
<<<<<<< HEAD
=======
                                default-page-size={pageSize}
>>>>>>> LEXCommunityLiJun
                                previous-button-disabled={previousButtonDisabled}
                                next-button-disabled={nextButtonDisabled}
                                record-start={recordStart}
@@ -711,10 +708,7 @@
                                onfirst={goFirstPage}
                                onlast={goLastPage}
                                page-size-options={pageSizeOptions}
<<<<<<< HEAD
=======
                                default-page-size={pageSize}
>>>>>>> LEXCommunityLiJun
                                previous-button-disabled={previousButtonDisabled}
                                next-button-disabled={nextButtonDisabled}
                                record-start={recordStart}
@@ -1105,8 +1099,4 @@
            <div class="slds-backdrop slds-backdrop_open"></div>
        </template>
    </template>
<<<<<<< HEAD
</template>
=======
</template>
>>>>>>> LEXCommunityLiJun