Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-30 5a5e18d266370a7717db57c7275468868f29ed8e

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