From 06272f6bb1002badb75f67d6c44a1b00bba32a76 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
index b3f8cc9..d7ce21d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
@@ -13,36 +13,39 @@
@Data
public class MerConsumerGoodsListVo {
- @ApiModelProperty("服务id")
+ @ApiModelProperty(value="服务id")
private String consumerGoodsId;
- @ApiModelProperty("服务状态-1删除1未完成2完成")
+ @ApiModelProperty(value="服务状态-1删除1未完成2完成")
private Integer serviceStatus;
- @ApiModelProperty("商户id")
+ @ApiModelProperty(value="商户id")
private Long shopId;
- @ApiModelProperty("商品类型1周期2服务3体验4单品")
+ @ApiModelProperty(value="商品类型1周期2服务3体验4单品")
private Integer goodsType;
- @ApiModelProperty("商品名称")
+ @ApiModelProperty(value="商品名称")
private String goodsName;
@ApiModelProperty(value = "商品简介")
private String goodsIntroduction;
- @ApiModelProperty("商品图片")
+ @ApiModelProperty(value="商品图片")
private String goodsPicture;
- @ApiModelProperty("商品调理问题")
+ @ApiModelProperty(value="商品调理问题")
private String goodsNurses;
- @ApiModelProperty("周期标记")
+ @ApiModelProperty(value="周期标记")
private Integer cycleNumFlag;
- @ApiModelProperty("服务次数")
+ @ApiModelProperty(value="服务次数")
private Integer serviceNum;
- @ApiModelProperty("消耗次数")
+ @ApiModelProperty(value="消耗次数")
private Integer usedNum;
+
+ @ApiModelProperty(value="待确认次数")
+ private Integer sureNum;
}
--
Gitblit v1.7.1