Merge remote-tracking branch 'origin/score_shop' into develop

jiangyouyao

2022-04-06 143acd2312a766f39c75b82bce5a32412b863825

 zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java

@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.util.Date;

@Data
@@ -34,6 +35,7 @@
    @ApiModelProperty(value = "订单金额")
    private Double  orderMoney;


    @ApiModelProperty(value = " 收益类型1，推广收益，2邀请收益")
    private Integer  revenueType;