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

jyy

2021-04-09 63170eb558babf81890cb23a453680e1054ecf85

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

@@ -690,7 +690,9 @@
                    callback: function (data) {
                        _this.isRefund = false;
                        _this.dialogSettleVisible = false;
                        _this.queryOrderDetailData(_this.data.oldOrderId);
                        var param = {};
                        param.id = _this.data.oldOrderId;
                        _this.queryOrderDetailData(param);
                    }
                });