Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

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

@@ -37,4 +37,13 @@
    @ApiModelProperty(value = "自动确认收货(天)", required = true)
    private String autoConfirmReceipt;

    @ApiModelProperty(value = "无人抢单通知时间(分钟)", required = true)
    private String noGrabNotifyTime;

    @ApiModelProperty(value = "无人抢单短信通知人员主键(多个以,分割)", required = true)
    private String noGrabNotifyUsers;

    @ApiModelProperty(value = "默认配送范围(km)", required = true)
    private String defaultDeliveryRange;

}