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

无关风月

2025-08-28 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java

@@ -28,4 +28,6 @@
    Object changeState(List<Integer> ids, Integer state);

    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);

    List<ConsumeDetail> getConsumeDetails1(BillingDataRequestVo requestVo);
}