From 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 17 Sep 2025 19:44:00 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
index 011205f..a99b340 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
@@ -7,6 +7,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -21,6 +22,9 @@
/*@NotBlank
@ApiModelProperty(value = "店铺简称", example = "永辉超市(新纪元店)")
private String storeShortName;*/
+
+ @ApiModelProperty(value = "商户ID")
+ private Long merchantId;
@NotNull
@ApiModelProperty(value = "店铺LOGO文件ID", example = "14567785444763247876234")
@@ -67,6 +71,9 @@
@ApiModelProperty(value = "是否支持自提")
private Integer selfPickup;
+ @ApiModelProperty(value = "包装费用")
+ private BigDecimal packagingFee;
+
@ApiModelProperty(value = "店铺资质", example = "[]")
private List<StoreQualificationCreateRequest> qualificationList = new ArrayList<>();
--
Gitblit v1.9.3