Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-01 a85ab71180fdcb02b3cae304ebc96bb2ca12423c

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java

@@ -17,6 +17,8 @@

    @ApiModelProperty(value = "用户手机号")
    private String phone;
    @ApiModelProperty(value = "用户id")
    private Long appUserId;

    @ApiModelProperty(value = "参与类型 优惠券 会员抵扣 会员活动 赠送会员")
    private String type;