Merge branch 'lyq' into 'test'

罗元桥

2021-05-25 b24f9c75c79e4de248505295bfea7055e4975ff4

 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;