Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-25 b02836d6cdcc2092eb6a864f52c90379e4d171b9

 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";
    }