Merge branch 'api_score_meger'

935090232@qq.com

2022-02-20 c253b555c7905c5136d47cd615ef545fa50cc6ad

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html

@@ -408,6 +408,10 @@
                                label="支付方式">
                        </el-table-column>
                        <el-table-column
                                prop="cardName"
                                label="储值卡名称">
                        </el-table-column>
                        <el-table-column
                                prop="flowNo"
                                label="流水号">
                        </el-table-column>