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

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java

@@ -43,7 +43,7 @@
    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;;

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

    @ApiModelProperty(value = "商品默认服务次数")