From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java b/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
index 4d21d17..b2e5dea 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
@@ -14,10 +14,12 @@
Store store = new Store();
BeanUtil.copyProperties(request, store, CopyOptions.create().setIgnoreNullValue(true));
- store.setMerchantId(SecurityUtils.getCurrentUserId());
+ // 由前端传入，不允许修改
+ //store.setMerchantId(SecurityUtils.getCurrentUserId());
Long logoUploadFileId = request.getLogoUploadFileId();
store.setLogoImageId(logoUploadFileId);
store.setLogoImageUrl(ImageUtils.getPublicObjectUrl(logoUploadFileId));
+
Long coverUploadFileId = request.getCoverUploadFileId();
store.setCoverImageId(coverUploadFileId);
store.setCoverImageUrl(ImageUtils.getPublicObjectUrl(coverUploadFileId));
--
Gitblit v1.9.3