From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 25 Oct 2021 13:30:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java index 8e837b5..69de0e7 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java +++ b/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; -- Gitblit v1.9.1