Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSelectGoodsPageVo.java

@@ -25,7 +25,10 @@
    private String goodsNo;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private String goodsType;
    private Integer goodsType;

    @ApiModelProperty(value = "商品类型")
    private String goodsTypeName;

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