From 5ad4fb34ee60e2d90d0cdb1d974ca0f4a2f26d95 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 13:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..788932a 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
@@ -38,9 +38,9 @@
@TableField("pid")
private Integer pid;
- @ApiModelProperty(value = "营业星期（1,2,3,4,5,6,7）")
+ @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
@TableField("business_date")
- private String businessDate;
+ private Integer businessDate;
@ApiModelProperty(value = "开始时间（HH:mm）")
@TableField("start_time")
@@ -49,6 +49,14 @@
@ApiModelProperty(value = "结束时间（HH:mm）")
@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")
@@ -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