From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
index d915b1a..4abbdcc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
@@ -104,5 +104,9 @@
      * 添加时间
      */
     private Date insertTime;
+    /**
+     * 课包支付配置id
+     */
+    private Integer coursePackageConfigId;
 
 }

--
Gitblit v1.7.1