Merge branch 'test_elder_cedoo' into test

CeDo

2021-06-10 02a8a0e41f4aae724f035a5b6ba91c360aa1b951

 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;