Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

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

@@ -19,7 +19,4 @@
    @ApiModelProperty(value = "订单主键", required = true)
    private Integer orderId;

    @NotNull(message = "门店主键不能为空")
    @ApiModelProperty(value = "当前操作门店主键", required = true)
    private Integer shopId;
}