From 9fcffba8403c50c87006ce8c58d980e0d0ccf892 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sun, 22 Jun 2025 23:23:09 +0800
Subject: [PATCH] fix(product): 处理null问题

---
 oying-system/src/main/java/com/oying/modules/pc/store/view/StoreMerchantView.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreMerchantView.java b/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreMerchantView.java
index d5c970f..cb84e75 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreMerchantView.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/view/StoreMerchantView.java
@@ -17,7 +17,20 @@
     @ApiModelProperty(value = "店铺名称")
     private String storeName;
 
-    private String logoUrl;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "店铺logo图片")
+    private Long logoImageId;
+
+    @ApiModelProperty(value = "店铺logo图片Url")
+    private String logoImageUrl;
+
+    @ApiModelProperty(value = "店铺封面图")
+    private Long coverImageId;
+
+    @ApiModelProperty(value = "店铺封面图Url")
+    private String coverImageUrl;
 
     @ApiModelProperty(value = "店铺描述")
     private String description;
@@ -43,6 +56,13 @@
     @ApiModelProperty(value = "营业半径(米)")
     private Integer radius;
 
-    private Integer status;
+    @ApiModelProperty(value = "是否支持退货")
+    private Integer returns;
+
+    @ApiModelProperty(value = "是否支持自提")
+    private Integer selfPickup;
+
+    @ApiModelProperty(value = "版本号")
+    private Long version;
 
 }

--
Gitblit v1.9.3