代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/OrderStatisticsVO.java

@@ -22,5 +22,4 @@
    @ApiModelProperty(value = "待收货订单数")
    private Integer receivingNum = 0;


}