From faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 15:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 08b01fb..42c9ced 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/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());

--
Gitblit v1.7.1