Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-21 3ffa739e77cdafdc4be1aa153acb3423071cd102

 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;