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

11fa8970 · 胡佳晨 · a1063b08 · 2b6d5098 · 11fa8970
Commit 11fa8970 authored Dec 28, 2021 by 胡佳晨
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

performanceOrderList.html ...ngzai/kylin/performancesExpress/performanceOrderList.html +1 -1

No files found.
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
@@ -442,7 +442,7 @@
                    field: '',
                    title: '快递方式',
                    formatter: function (value, row) {
-                        let dictLabel = $.table.selectDictLabel(prizeType, value);
+                        let dictLabel = $.table.selectDictLabel(expressType, value);
                        return '快递方式：' + dictLabel + '<br>' + '已支付快递费：' + row.priceExpress;
                    }
                },