From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 22 Feb 2022 23:41:42 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java index f0a28b7..999b02c 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java @@ -7,8 +7,8 @@ /** * @description 推广员等级 - * @author jyy - * @date 2021-03-10 15:22 + * @author yourName + * @date 2021-03-10 17:34 */ @Data @TableName("shop_salesman_grade") @@ -33,6 +33,13 @@ private Double sealesCommission; + + /** + * 自购返佣比例% + */ + + private Double selfCommission; + /** * 邀请提成 % @@ -46,7 +53,7 @@ */ - private Double condition; + private Double gradeCondition; /** * 默认等级1是,2不是 -- Gitblit v1.9.1