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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 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);
}