Merge remote-tracking branch 'origin/dev' into dev

zxl

7 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -22,6 +22,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;
import java.util.stream.Collectors;

/**
@@ -129,6 +130,9 @@
    @ApiModelProperty(value = "已发货数量")
    private Integer deliverNumber;

    @ApiModelProperty(value = "抽成比例")
    private BigDecimal commission;
    
    public Integer getDeliverNumber() {
        if(deliverNumber == null){
            return 0;