From 81ad1c74ca7ea0c544135cb78d8289e79c61f1fc Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 14 七月 2023 10:21:27 +0800
Subject: [PATCH] Merge branch 'fhx-prod-兑换优惠券' into master-test
---
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java | 5 +++++
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java | 30 ++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
new file mode 100644
index 0000000..c980f9c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
@@ -0,0 +1,30 @@
+package com.hz.phis.dt.consumables;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧鍏宠仈缁勫悎
+ * @USER: fhx
+ * @DATE: 2023/7/12
+ **/
+@Data
+public class GoodsAssocDt {
+
+ /** 鑰楁潗琛ㄦ爣璇�(Consumables) */
+ private String consumableId;
+ /** 鍏宠仈绫诲瀷 */
+ public String commonType;
+ /** 鍏宠仈鏍囪瘑(浼樻儬鍒竔d) */
+ public String commonId;
+ /** 鍏宠仈鍚嶇О */
+ public String commonName;
+ /** 鏁伴噺 */
+ public Integer quantity;
+
+
+ //////////////////////////////////
+ /** 鍏宠仈绫诲瀷 - 浼樻儬鍒� */
+ public static final String COMMON_TYPE_COUPON = "coupon";
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
index 8284598..66d5616 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
@@ -3,6 +3,8 @@
import com.hz.phis.dt.limit.LimitDt;
import lombok.Data;
+import java.util.List;
+
/**
* 鍟嗗搧璇︽儏闄愬埗瀹炰綋
* @author fwq
@@ -14,4 +16,7 @@
private GoodsDetailDt consumables;
/**闄愬埗淇℃伅*/
private LimitDt limitBo;
+ /** 鍟嗗搧鍏宠仈淇℃伅 */
+ private List<GoodsAssocDt> assocList;
+
}
--
Gitblit v1.8.0