代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 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;


}