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 |    3 +++
 1 files changed, 3 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 05c2404..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
@@ -23,6 +23,9 @@
     @ApiModelProperty(value = "店铺简称", example = "永辉超市(新纪元店)")
     private String storeShortName;*/
 
+    @ApiModelProperty(value = "商户ID")
+    private Long merchantId;
+
     @NotNull
     @ApiModelProperty(value = "店铺LOGO文件ID", example = "14567785444763247876234")
     private Long logoUploadFileId;

--
Gitblit v1.9.3