Merge remote-tracking branch 'origin/master'

doum

21 小时以前 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java

@@ -14,18 +14,18 @@
public class MyPageResponse {

    @ApiModelProperty(value = "待支付订单数量")
    private Integer waitPayOrders;
    private Long waitPayOrders;

    @ApiModelProperty(value = "待发货订单数量")
    private Integer waitOrders;
    private Long waitOrders;

    @ApiModelProperty(value = "待收货订单数量")
    private Integer waitReceivedOrders;
    private Long waitReceivedOrders;

    @ApiModelProperty(value = "已完成订单数量")
    private Integer finishOrders;
    private Long finishOrders;

    @ApiModelProperty(value = "售后中订单数量")
    private Integer afterOrders;
    private Long afterOrders;

}