From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 4158387..410d9cc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -483,6 +483,8 @@
             }
         }
         PointsMerchandise pointsMerchandise = new PointsMerchandise();
+        pointsMerchandise.setAddUserId(UserExt.getUser().getObjectId());
+        pointsMerchandise.setAddType(UserExt.getUser().getObjectType());
         pointsMerchandise.setType(typeAll);
         pointsMerchandise.setName(name);
         pointsMerchandise.setCoursePackageId(coursePackageId);

--
Gitblit v1.7.1