From 621d95aeff9feb8f4f1d7e2d33a18e5f2aa753c4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 28 十一月 2023 06:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 dfc7229..3458faa 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
@@ -898,9 +898,9 @@
list3.add(44);
detailsResponse.setRid(list3);
}else {
- ArrayList<Integer> list3 = new ArrayList<>();
- list3.add(43);
- detailsResponse.setRid(list3);
+ ArrayList<Integer> list4 = new ArrayList<>();
+ list4.add(43);
+ detailsResponse.setRid(list4);
}
}
}
--
Gitblit v1.7.1