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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryVO.java

@@ -23,6 +23,7 @@

    @ApiModelProperty("订单数量")
    private Integer number;
    private Integer fakeNumber;
    private Integer fakeCount;

}