Merge remote-tracking branch 'origin/master'

doum

4 天以前 c51de64d5ee334d914c90f5e4f82a13f159492ca

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

@@ -36,4 +36,7 @@
    @ApiModelProperty(value = "门店名称（模糊查询）", example = "XX门店")
    private String name;

    @ApiModelProperty(value = "城市主键", example = "1")
    private Integer cityId;

}