Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

tangxiaobao

2021-07-14 c64da5152d32c366eecfb20b3fdc023be1d27681

 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;