From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
index 461c7cb..5ba2fd9 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java
@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalTime;
+import java.util.Date;
import java.util.List;
/**
@@ -92,6 +93,9 @@
@ApiModelProperty(value = "营业结束时间")
private LocalTime closeTime;
+ @ApiModelProperty(value = "营业状态")
+ private Integer businessStatus;
+
@ApiModelProperty(value = "省级代码")
private String provinceCode;
@@ -128,9 +132,8 @@
@ApiModelProperty(value = "是否支持自提")
private Integer selfPickup;
- @NotNull
- @ApiModelProperty(value = "版本号")
- private Long version;
+ @ApiModelProperty(value = "审核状态")
+ private Integer auditStatus;
@TableField(exist = false)
@ApiModelProperty(value = "评分")
@@ -141,8 +144,20 @@
private Integer deliveryDuration = 0;
@TableField(exist = false)
+ @ApiModelProperty(value = "配送时长")
+ private Integer deliveryTime = 0;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "销量")
+ private Integer totalUnitsSold = 0;
+
+ @TableField(exist = false)
@ApiModelProperty(value = "月销售量")
- private Integer monthlySales = 0;
+ private Integer monthlyUnitsSold = 0;
+
+ @NotNull
+ @ApiModelProperty(value = "版本号")
+ private Long version;
@TableField(exist = false)
@ApiModelProperty(value = "资质")
--
Gitblit v1.9.3