Merge remote-tracking branch 'origin/master'

rk

11 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/services/src/main/java/com/doumee/dao/vo/OrderDispatchVO.java

@@ -28,25 +28,5 @@
    private String typeDesc;

    @ApiModelProperty(value = "订单物品详情")
    private List<DispatchItemVO> detailList;

    /**
     * 物品明细项
     */
    @Data
    @ApiModel("派单物品明细项")
    public static class DispatchItemVO {

        @ApiModelProperty(value = "尺寸名称")
        private String luggageName;

        @ApiModelProperty(value = "数量")
        private Integer num;

        @ApiModelProperty(value = "单价（元）")
        private Double unitPriceYuan;

        @ApiModelProperty(value = "小计费用（元）")
        private Double subtotal;
    }
    private List<OrderItemVO> detailList;
}