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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

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

@@ -909,7 +909,6 @@
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }

                                }
                            }
                            //======================================================