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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -20,5 +20,8 @@
    @ApiModelProperty("已完结订单数")
    private Integer completed;

    @ApiModelProperty("待预约订单数")
    private Integer pending;


}