Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

44323

2024-01-24 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c

 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;

@@ -38,9 +37,11 @@
    private String goodsNurses;

    @ApiModelProperty(value = "商品建议售价")

    private BigDecimal suggestSalesPrice;;

    @ApiModelProperty(value = "商品售价")
    
    private BigDecimal salesPrice;;

    @ApiModelProperty(value="周期次数标记0否1是")