From dc249113553d081aaa26d4d1f3718b5514363131 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 02 七月 2025 23:23:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev
---
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java
index a93db09..2d105d4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java
@@ -1,11 +1,15 @@
package cn.lili.modules.goods.entity.dto;
import cn.lili.modules.goods.entity.dos.GoodsSku;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* @author paulG
@@ -22,4 +26,16 @@
@ApiModelProperty(value = "鍟嗗搧鍙傛暟json")
private String params;
+
+ @ApiModelProperty(value = "棰勫敭缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date preSaleEndDate;
+
+ @ApiModelProperty(value = "棰勫敭寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date preSaleBeginDate;
+
+
}
--
Gitblit v1.8.0