Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

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

@@ -74,4 +74,8 @@
    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("商家简介")
    @Size(max = 25,min = 1,message = "简介长度不符合！")
    private String storeDescribe;

}