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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

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