Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-28 621d95aeff9feb8f4f1d7e2d33a18e5f2aa753c4

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

@@ -898,9 +898,9 @@
                                        list3.add(44);
                                        detailsResponse.setRid(list3);
                                    }else {
                                        ArrayList<Integer> list3 = new ArrayList<>();
                                        list3.add(43);
                                        detailsResponse.setRid(list3);
                                        ArrayList<Integer> list4 = new ArrayList<>();
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }
                                }
                            }