From 9974b1fffff1cad712b7c30fb4c708ef45ec4b8c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 17 Mar 2021 09:44:03 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java index 68a0b7d..fd8d9b2 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.matrix.core.anotations.Extend; import com.matrix.system.score.entity.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -16,43 +17,50 @@ @Extend private static final long serialVersionUID = 1L; - + /** + * 推广收益类型 推广收益 + */ + public static final String TYPE_TGSY = "推广收益"; + /** + * 推广收益类型 邀请收益 + */ + + public static final String TYPE_YQSY = "邀请收益"; /** * 用户id */ - - + @ApiModelProperty(hidden = true) private String userId; /** * 收益说明 */ - + @ApiModelProperty(value = "收益说明") private String revenueContent; /** * 收益金额 */ - + @ApiModelProperty(value = "收益金额") private Double amount; /** * 原始订单ID */ - + @ApiModelProperty(value = "原始订单ID") private Long businessId; /** * 公司ID */ - + @ApiModelProperty(hidden = true) private Long companyId; -- Gitblit v1.9.1