Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

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

@@ -26,6 +26,9 @@
    @ApiModelProperty("店铺id")
    private Long storeId;

    @ApiModelProperty("店铺名称")
    private String storeName;

    @ApiModelProperty("用户id")
    private Long userId;