From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppConsumerPageVo.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppConsumerPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppConsumerPageVo.java
index f5ae2c0..894ae34 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppConsumerPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppConsumerPageVo.java
@@ -1,7 +1,5 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,34 +13,43 @@
@Data
public class AppConsumerPageVo {
- @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 goodsTag;
+
+ @ApiModelProperty(value="商品名称")
private String goodsName;
- @ApiModelProperty("商品图片")
+ @ApiModelProperty(value="商品名称")
+ private String goodsIntroduction;
+
+ @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