Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

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

@@ -48,37 +48,45 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal serviceMoney;

    @ApiModelProperty(value = "总人数")
    @ApiModelProperty(value = "总参与人数")
    private Integer orderJoinPerson;

    @ApiModelProperty(value = "总获客人数")
    private Integer orderPerson;

    @ApiModelProperty(value = "周期人数")
    @ApiModelProperty(value = "周期获客人数")
    private Integer cyclePerson;

    @ApiModelProperty(value = "体验人数")
    @ApiModelProperty(value = "体验获客人数")
    private Integer experiencePerson;

    @ApiModelProperty(value = "服务人数")
    @ApiModelProperty(value = "服务获客人数")
    private Integer servicePerson;

    @ApiModelProperty(value = "订单数量key")
    @ApiModelProperty(value = "订单分布日期")
    private String[] orderTotalKey;

    @ApiModelProperty(value = "订单数量value")
    @ApiModelProperty(value = "订单分布数量")
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单金额value")
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "订单分布金额")
    private BigDecimal[] orderMoneyValue;

    @ApiModelProperty(value = "商品类型数量")
    @ApiModelProperty(value = "销售占比数量")
    private List<MgtMapIntTotalVo> goodsTypeTotalList;

    @ApiModelProperty(value = "商品类型金额")
    @ApiModelProperty(value = "销售占比金额")
    private List<MgtMapBigTotalVo> goodsTypeMoneyList;

    @ApiModelProperty(value = "活动年龄分布key")
   /* @ApiModelProperty(value = "活动年龄分布key")
    private String[] activityAgeKey;

    @ApiModelProperty(value = "活动年龄分布value")
    private Integer[] activityAgeValue;
    private Integer[] activityAgeValue;*/

    @ApiModelProperty(value = "参与人数key")
    private String[] joinMemberTotalKey;

    @ApiModelProperty(value = "参与人数value")
    private Integer[] joinMemberTotalValue;
}