From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改

---
 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