From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台:首页统计、系统管理、广告管理、用户管理、商品分类管理

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
index ed06888..138b151 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
@@ -1,5 +1,6 @@
 package com.ruoyi.other.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.other.api.domain.Shop;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +36,8 @@
     private String detailPicture;
 
 
+    @ApiModelProperty(value = "详情图,多个逗号分隔")
+    private Integer goodsCategoryId;
 
     @ApiModelProperty(value = "基础积分")
     private Integer integral;
@@ -51,16 +54,34 @@
     @ApiModelProperty(value = "门店id")
     private Integer shopId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "活动开始时间")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "活动结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
 
     @ApiModelProperty(value = "状态(1=下架,2=上架)")
     private Integer status;
 
+
+    @ApiModelProperty(value = "商品售价(编辑商品)")
+    private BigDecimal editPrice;
+    @ApiModelProperty(value = "限购数量(编辑商品)")
+    private Integer editNum;
+
+    @ApiModelProperty(value = "是否秒杀活动,0-否,1-是")
+    private Integer isSkillActivity;
+
+
+    @ApiModelProperty(value = "活动限购数量(编辑商品)")
+    private Integer editActivityNum;
+
+    @ApiModelProperty(value = "活动价格(编辑商品)")
+    private BigDecimal editActivityPrice;
+
     @ApiModelProperty(value = "门店")
     private Shop shop;
 

--
Gitblit v1.7.1