From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
index 9d8b476..86f4641 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java
@@ -1,6 +1,5 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,15 +34,17 @@
private Integer goodsType;
@ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
+ private String goodsNurses;
@ApiModelProperty(value = "商品建议售价")
+
private BigDecimal suggestSalesPrice;;
@ApiModelProperty(value = "商品售价")
+
private BigDecimal salesPrice;;
- @ApiModelProperty("周期次数标记0否1是")
+ @ApiModelProperty(value="周期次数标记0否1是")
private Integer cycleNumFlag;
@ApiModelProperty(value = "商品默认服务次数")
--
Gitblit v1.7.1