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/StoreUpdateRequest.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
index bf35cd7..de71ed4 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
@@ -26,9 +26,6 @@
     @ApiModelProperty(value = "店铺ID")
     private Long storeId;
 
-    @ApiModelProperty(value = "商户ID")
-    private Long merchantId;
-
     @ApiModelProperty(value = "平台类目")
     private Long platformCategoryId;
 

--
Gitblit v1.9.3