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

jyy

2021-03-17 301d10c88b03bc7993c64c3467b1bcb0b48104ea

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html

@@ -468,6 +468,7 @@
                    callback: function (data) {
                        _this.orderLevelList.rows = data.rows;
                        _this.orderLevelList.total = data.total;
                        _this.loadFenxiaoOrderBasic();
                    }
                });
            },
@@ -518,6 +519,7 @@
                    callback: function (data) {
                        _this.fxyList.rows = data.rows;
                        _this.fxyList.total = data.total;
                        _this.loadFenxiaoOrderBasic();
                    }
                });
            },