Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 f28142767f8823667499e6e94a76789f601f1654

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java

@@ -115,7 +115,7 @@
         if (StringUtils.isNotEmpty(vipIds)){
            String[] vipIdArr = vipIds.split(",");
            if (vipIdArr.length == 7){
               item.setVipIds("全部");
               item.setVipName("全部");
            }else {
               List<String> vipNameList = new ArrayList<>();
               for (String vipId : vipIdArr) {