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

mitao

2025-11-05 faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -649,6 +649,8 @@
            // 进场二维码新增参数codeType 1=订场 2=散客，3=门票,玩湃惠民卡codeType=4
            map.put("codeType", targetAudience);
            map.put("dataId", siteBooking.getId());
//            map.put("siteName", siteBooking.getNextName()==null?"":siteBooking.getNextName());
//            map.put("halfName", siteBooking.getHalfName()==null?"":siteBooking.getHalfName());
            System.err.println("订场类型:"+targetAudience);

            map.put("name", site.getName());