Merge remote-tracking branch 'origin/master'

rk

11 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

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

@@ -16,7 +16,7 @@
    @ApiModelProperty(value = "司机每日取消次数", required = true)
    private String driverDailyCancelLimit;

    @ApiModelProperty(value = "未取件折扣", required = true)
    @ApiModelProperty(value = "未取件逾期折扣", required = true)
    private String unpickedDiscount;

    @ApiModelProperty(value = "订单结算日期", required = true)