Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-21 93707c75f49a543f122349f88b53d65aac51861b

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

@@ -12,6 +12,9 @@
@ApiModel("订单信息")
public class ComShopOrderPageVO {

    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "订单号")
    private String orderNo;