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/dto/ShopTotalChangeDto.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value = "1下单2取消")
    private Integer orderType;

    @ApiModelProperty(value = "周期订单金额")
    private BigDecimal cycleMoney;