Merge remote-tracking branch 'origin/master'

CeDo

2021-04-20 38541a4e5731da9f478b50875a1d4cb978b0cfd5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java

@@ -68,4 +68,7 @@
    @JsonIgnore
    private Long loginUserId;

    @ApiModelProperty("id")
    private Long id;

}