From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 05 十二月 2024 14:53:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 d9cba6a..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") -- Gitblit v1.7.1