Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 70eb051b54b835edb3f93e701e5d07a1d21045e6

 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;