From 918fd83c407287856ba95905287de21877f5c1eb Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 17 Sep 2025 16:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E4=BF=AE=E5=A4=8D=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=E5=AF=BC=E8=87=B4=E7=9A=84=E9=87=91=E9=A2=9D=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/app/MeetingBookingDetailVo.java   | 55 +++----------------
 .../vo/meeting/app/MeetingBookingListVo.java  |  1 +
 .../supermarket/entity/ShopSkuEntity.java     |  6 +-
 3 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingDetailVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingDetailVo.java
index c2357c292..dbf53d39b 100644
--- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingDetailVo.java
+++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingDetailVo.java
@@ -9,17 +9,17 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 /**
- * 预约详情VO
+ * 会议预约详情VO
  *
  * @author zjf
  * @date 2025-01-17
  */
 @Data
-@Schema(description = "预约详情VO")
+@Schema(description = "会议预约详情VO")
 public class MeetingBookingDetailVo {
 
     /**
-     * id
+     * 预约ID
      */
     @Schema(description = "预约ID")
     private Long id;
@@ -31,7 +31,7 @@ public class MeetingBookingDetailVo {
     private String title;
 
     /**
-     * 会议室id
+     * 会议室ID
      */
     @Schema(description = "会议室ID")
     private Long roomId;
@@ -61,9 +61,9 @@ public class MeetingBookingDetailVo {
     private String roomEquipment;
 
     /**
-     * 会议室图片
+     * 会议室图片URL
      */
-    @Schema(description = "会议室图片")
+    @Schema(description = "会议室图片URL")
     private String roomPicUrl;
 
     /**
@@ -84,12 +84,6 @@ public class MeetingBookingDetailVo {
     @Schema(description = "会议室状态描述")
     private String roomStatusText;
 
-    /**
-     * 会议室可用时间段
-     */
-    @Schema(description = "会议室可用时间段")
-    private String roomAvailableTime;
-
     /**
      * 会议说明
      */
@@ -115,19 +109,7 @@ public class MeetingBookingDetailVo {
     private String checkReason;
 
     /**
-     * 部门id
-     */
-    @Schema(description = "部门ID")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @Schema(description = "部门名称")
-    private String deptName;
-
-    /**
-     * 申请人
+     * 申请人ID
      */
     @Schema(description = "申请人ID")
     private Long applicantId;
@@ -202,15 +184,9 @@ public class MeetingBookingDetailVo {
     private Integer isConfirmEnd;
 
     /**
-     * 流程实例id
+     * 创建人
      */
-    @Schema(description = "流程实例ID")
-    private String processInstanceId;
-
-    /**
-     * 创建者
-     */
-    @Schema(description = "创建者")
+    @Schema(description = "创建人")
     private String createBy;
 
     /**
@@ -219,17 +195,4 @@ public class MeetingBookingDetailVo {
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    @Schema(description = "更新者")
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @Schema(description = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTime;
 }
diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingListVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingListVo.java
index c0f751102..533394111 100644
--- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingListVo.java
+++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/MeetingBookingListVo.java
@@ -155,3 +155,4 @@ public class MeetingBookingListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 }
+
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSkuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSkuEntity.java
index e9a468767..190778426 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSkuEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSkuEntity.java
@@ -89,13 +89,13 @@ public class ShopSkuEntity extends Model<ShopSkuEntity> {
 	* 进价/单位分
 	*/
 	@Schema(description="进价/单位分")
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
    private Integer purchasePrice;
 	/**
 	* 零售价/单位分
 	*/
 	@Schema(description="零售价/单位分")
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
    private Integer retailPrice;
 	/**
 	* spuID
@@ -106,7 +106,7 @@ public class ShopSkuEntity extends Model<ShopSkuEntity> {
 	* 促销价
 	*/
 	@Schema(description="促销价")
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
    private Integer promotionPrice;
 	/**
 	* 库存