From 865fc8d02e44811fb423df7125055c3a85e38964 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 09:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 6569c12..5909e6d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -181,7 +181,8 @@
             for (PointsMerchandise merchandise : merchandises) {
                 IntegralCommodity integralCommodity = new IntegralCommodity();
                 integralCommodity.setCommodityId(merchandise.getId());
-                integralCommodity.setCommodityImg(merchandise.getProductImages());
+                String[] split = merchandise.getProductImages().split(",");
+                integralCommodity.setCommodityImg(split[0]);
                 integralCommodity.setCommodityName(merchandise.getName());
                 integralCommodity.setCommodityPrice(merchandise.getPrice());
                 integralCommodity.setGoodsType(merchandise.getType());

--
Gitblit v1.7.1