From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index 83dfe80..d9cba6a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -50,6 +50,14 @@
     @TableField("end_time")
     private String endTime;
 
+    @ApiModelProperty(value = "封面图片")
+    @TableField("home_picture")
+    private String homePicture;
+
+    @ApiModelProperty(value = "详情图,多个逗号分隔")
+    @TableField("details_picture")
+    private String detailsPicture;
+
     @ApiModelProperty(value = "店长姓名")
     @TableField("shop_manager")
     private String shopManager;
@@ -60,7 +68,7 @@
 
     @ApiModelProperty(value = "店长用户id")
     @TableField("app_user_id")
-    private Integer appUserId;
+    private Long appUserId;
 
     @ApiModelProperty(value = "客户电话(同步到t_phone表)")
     @TableField("service_tel")

--
Gitblit v1.7.1