From 6ceafc5b1f3d24dfa75b6b726a44c8a88acbe678 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 16 一月 2025 10:46:48 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java index 6569362..3c7f3dc 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java @@ -1,5 +1,7 @@ package com.ruoyi.other.vo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.other.api.domain.GoodsEvaluate; import com.ruoyi.other.api.domain.Shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -36,6 +38,10 @@ @ApiModelProperty(value = "详情图,多个逗号分隔") private String detailPicture; + + @ApiModelProperty(value = "现金支付(0=否,1=是)") + private Integer cashPayment; + @ApiModelProperty(value = "积分支付(0=否,1=是)") private Integer pointPayment; @@ -57,5 +63,8 @@ @ApiModelProperty(value = "门店列表") private List<Shop> shopList; + @ApiModelProperty("评价") + private GoodsEvaluate goodsEvaluate; + } -- Gitblit v1.7.1