From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java
index 9d1417d..51afa57 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsSku.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -58,6 +59,12 @@
@ApiModelProperty(value = "商品价格")
private BigDecimal price;
+ @ApiModelProperty(value = "普通会员价格")
+ private BigDecimal vipPrice;
+
+ @ApiModelProperty(value = "超级会员价格")
+ private BigDecimal superVipPrice;
+
@ApiModelProperty(value = "库存")
private Integer stock;
@@ -92,6 +99,7 @@
private String detail;
@ApiModelProperty(value = "排序")
+ @TableField(updateStrategy = FieldStrategy.IGNORED, insertStrategy = FieldStrategy.IGNORED)
private Integer sortNum;
@ApiModelProperty(value = "上架状态 0=上架中 1= 已下架")
@@ -106,7 +114,7 @@
private LocalDateTime createTime;
@ApiModelProperty(value = "更新者")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@ApiModelProperty(value = "更新时间")
@@ -117,5 +125,7 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "商品封面图（大屏）")
+ private String screenCoverPic;
}
--
Gitblit v1.7.1