From 91ad242055a7efd6ddb0ae82d7775b78cb2e1ed6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 28 十月 2025 09:41:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java |   61 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
index 90d6814..9f9d5bf 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
@@ -8,6 +8,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author zhibing.pu
@@ -26,6 +27,11 @@
      */
     @TableField("storeId")
     private Integer storeId;
+    /**
+     * 是否可预约
+     */
+    @TableField("isCanBeBooked")
+    private Integer isCanBeBooked;
     /**
      * 场地名称
      */
@@ -109,4 +115,59 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date insertTime;
 
+    @TableField("operatorId")
+    private Integer operatorId;
+    @TableField("typeName")
+    private String typeName;
+    @TableField("nextName")
+    private String nextName;
+    @TableField("ishalf")
+    private Integer ishalf;
+    @TableField("cashPriceOne")
+    private Double cashPriceOne;
+    @TableField("playPaiCoinOne")
+    private Double playPaiCoinOne;
+    @TableField("halfName")
+    private String halfName;
+    @TableField("introduce")
+    private String introduce;
+    @TableField("imgs")
+    private String imgs;
+    @TableField("ids")
+    private String ids;
+    // 是否可预约 0否1是
+    @TableField("reservation")
+    private Integer reservation;
+    
+    /**
+     * 面向人群:1=订场,2=散客,多个用逗号分隔(如:1,2)
+     */
+    @TableField("targetAudience")
+    private String targetAudience;
+    
+    /**
+     * 容纳散客数(仅当包含散客时有效)
+     */
+    @TableField("walkinCapacity")
+    private Integer walkinCapacity;
+    
+    /**
+     * 价格详情列表(不存储在数据库,用于接收前端传递的价格数据)
+     */
+    @TableField(exist = false)
+    private List<PriceDTO> priceDTOS;
+    
+    /**
+     * 价格详情内部类
+     */
+    @Data
+    public static class PriceDTO {
+        private String startTime;
+        private String endTime;
+        private Integer dayOfWeek;
+        private Integer targetAudience;
+        private Integer fieldType;
+        private Double cashPrice;
+        private Double coinPrice;
+    }
 }

--
Gitblit v1.7.1