Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -1053,7 +1053,7 @@
                detailsResponse.setGoodName(vipDetail.getTicketName());
                detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
                detailsResponse.setUseStatus(vipDetail.getStatus());
                detailsResponse.setUseStatus(vipDetail.getStatus()==1?2:1);
                detailsResponse.setGoodType(3);
                // 表明是会员赠送的门票
                detailsResponse.setExchangeType(4);