Merge remote-tracking branch 'origin/master'

doum

13 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/dao/dto/ShopInfoMaintainDTO.java

@@ -20,6 +20,9 @@
    @ApiModelProperty(value = "门店头像")
    private String coverImg;

    @ApiModelProperty(value = "门店头像（全路径）")
    private String coverImgUrl;

    @ApiModelProperty(value = "门店介绍")
    private String content;