Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;