From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back

---
 src/main/java/com/webmanage/vo/CartItemVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/webmanage/vo/CartItemVO.java b/src/main/java/com/webmanage/vo/CartItemVO.java
index b41078d..240e752 100644
--- a/src/main/java/com/webmanage/vo/CartItemVO.java
+++ b/src/main/java/com/webmanage/vo/CartItemVO.java
@@ -1,5 +1,6 @@
 package com.webmanage.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +19,7 @@
     private Long pricingId;
 
     @ApiModelProperty("鍟嗗搧ID")
-    private Long productId;
+    private String productId;
 
     @ApiModelProperty("鍟嗗搧鍚嶇О")
     private String productName;
@@ -66,8 +67,10 @@
     private String remarks;
 
     @ApiModelProperty("娣诲姞鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime addTime;
 
     @ApiModelProperty("鏈�鍚庢洿鏂版椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 }

--
Gitblit v1.8.0