From 548bead175143ab846aaf0816f2ff1129050e94a Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 21 Jul 2025 16:20:40 +0800
Subject: [PATCH] Merge branch 'master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
index 2fe6124..2c5e76f 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java
@@ -58,6 +58,9 @@
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "上架状态")
+    private Integer shelfStatus;
+
     @NotBlank
     @ApiModelProperty(value = "主图片")
     private String mainImageId;
@@ -102,6 +105,14 @@
     @ApiModelProperty(value = "是否支持自提")
     private Integer selfPickup;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "销量")
+    private Integer totalUnitsSold = 0;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "月销售量")
+    private Integer monthlyUnitsSold = 0;
+
     @NotNull
     @ApiModelProperty(value = "是否删除")
     private Integer deletedFlag;

--
Gitblit v1.9.3