From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java
index 890a6df..c197ed5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java
@@ -1,14 +1,15 @@
package com.ruoyi.goods.controller.management.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.ListingStatusEnum;
-import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleValueDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
-
+import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
/**
* @author mitao
* @date 2024/5/20
@@ -26,7 +27,8 @@
private String skuName;
@ApiModelProperty(value = "商品年份")
- private String years;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime years;
@ApiModelProperty(value = "商品分类id")
private Long categoryId;
@@ -47,7 +49,7 @@
private Integer stock;
@ApiModelProperty(value = "已售数量")
- private Integer soldQuantity;
+ private Integer soldQuantity = 0;
@ApiModelProperty(value = "单位")
private String unit;
@@ -71,7 +73,7 @@
private String sharePic;
@ApiModelProperty(value = "商品信息")
- private List<GoodsInfoTitleValueDTO> goodsInfoTitleValueDTOList;
+ private List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList;
@ApiModelProperty(value = "商品描述")
private String description;
--
Gitblit v1.7.1