Merge remote-tracking branch 'origin/dev' into dev

maven

5 天以前 ccef2b613fe21a6be5f2096f88a2de5eb301adde

 src/views/salesManagement/receiptPayment/index.vue

@@ -65,6 +65,7 @@
        :summary-method="summarizeMainTable"
        :expand-row-keys="expandedRowKeys"
        @expand-change="expandChange"

        height="calc(100vh - 18.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />