Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 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));