Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

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

@@ -324,7 +324,6 @@
        }


//        if (cIds.size()>0) {

        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds)
                .eq("state", 1)
@@ -341,9 +340,10 @@
                integralCommodity.setSort(merchandise.getSort());
                commodity.add(integralCommodity);
            }
//            }
        }



        System.out.println(commodity);
        return commodity;
    }