Merge remote-tracking branch 'origin/dev' into dev

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderResultVO.java

@@ -21,6 +21,8 @@

    @ApiModelProperty("订单总数量")
    private Integer orderTotalNumber;
    @ApiModelProperty("虚假订单数量")
    private Integer fakeTotalNumber;

    @ApiModelProperty("柱状图数据")
    private List<OrderQueryVO> orderList;