From a7501803a3ca43310e57a5dd912e5047919c2e43 Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Tue, 15 Jul 2025 15:26:55 +0800 Subject: [PATCH] Merge branch 'xin' into pxb --- oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 8eb184c..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 = "评分") @@ -152,6 +155,10 @@ @ApiModelProperty(value = "月销售量") private Integer monthlyUnitsSold = 0; + @NotNull + @ApiModelProperty(value = "版本号") + private Long version; + @TableField(exist = false) @ApiModelProperty(value = "资质") private List<StoreQualification> qualifications; -- Gitblit v1.9.3