Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 d7900626300f849ee41e4c1bdb3e2ed91906e229

 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;

}