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

jiangqs

2023-05-09 0398509aa5f27bd6f987adf3d24eceef56b07b4c

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsListDto.java

@@ -18,5 +18,5 @@
    private String consumerGoodsId;

    @ApiModelProperty(name = "服务次数")
    private Integer service_num;
    private Integer serviceNum;
}