From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期五, 20 十二月 2024 18:32:03 +0800 Subject: [PATCH] 1 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 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..9b4068a 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") @@ -88,27 +96,23 @@ @ApiModelProperty(value = "门店积分总数") @TableField("shop_all_point") - private BigDecimal shopAllPoint; + private Integer shopAllPoint; @ApiModelProperty(value = "门店业绩积分") @TableField("shop_point") - private BigDecimal shopPoint; + private Integer shopPoint; @ApiModelProperty(value = "门店返佣积分") @TableField("share_point") - private BigDecimal sharePoint; + private Integer sharePoint; @ApiModelProperty(value = "门店服务积分") @TableField("server_point") - private BigDecimal serverPoint; - - @ApiModelProperty(value = "下级门店返佣积分") - @TableField("lower_level_rebate_points") - private BigDecimal lowerLevelRebatePoints; + private Integer serverPoint; @ApiModelProperty(value = "门店已用积分") @TableField("use_point") - private BigDecimal usePoint; + private Integer usePoint; @ApiModelProperty(value = "门店分佣总金额") @TableField("giveaway_all_money") @@ -156,4 +160,5 @@ private LocalDateTime createTime; + } -- Gitblit v1.7.1