From 5d47b1c7a70ebd532e39906c6c238531258405e3 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 14:32:50 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
index 99d661c..5c37494 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
@@ -77,6 +77,11 @@
 	 * 充值卡的id
 	 */
 	private Long  goodsId;
+
+	/**
+	 * 订单ID
+	 */
+	private Long  orderId;
 			
 	
 	private Long  vipId;
@@ -88,7 +93,7 @@
 	private String  isOver;
 			
 	/**
-	 * 是会籍卡? Y 是,N否
+	 * 是默认储值卡? Y 是,N否
 	 */
 	private String  isVipCar;
 	/**
@@ -105,6 +110,14 @@
 	 */
 	private String cardName;
 
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
 	public String getCardName() {
 		return cardName;
 	}

--
Gitblit v1.9.1