From 50050ada04e8ae7bbbeb6342b4e3e35fba3890ec Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 17:36:47 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java |    6 ++++++
 1 files changed, 6 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..87b87de 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,11 @@
      * 添加时间
      */
     private Date insertTime;
+    /**
+     * 课包支付配置id
+     */
+    private Integer coursePackageConfigId;
+    private Integer addUserId;
+    private Integer addType;
 
 }

--
Gitblit v1.7.1