From ebbe59b6ee3378fa296441cabe8bb81b2bc200b5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 26 Apr 2021 13:47:22 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
index 9badbd1..ed53c67 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java
@@ -109,6 +109,8 @@
moneyCardUse.setVipId(order.getVipId());
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
+ WebUtil.getRequest().setAttribute("orderParam", id);
+
WebUtil.getRequest().setAttribute("cards", cards);
return "admin/hive-erp/order/orderXq-form";
}
--
Gitblit v1.9.1