Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-22 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112

 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;