From f24e61e9b0d8efc55f974bbec25fb0fb73b04ece Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Jul 2021 14:18:57 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java |    6 +++---
 1 files changed, 3 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..a29b2c3 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")
@@ -46,7 +46,7 @@
 	 */
 
 
-	private Double  condition;
+	private Double  gradeCondition;
 	
 	/**
 	 * 默认等级1是,2不是

--
Gitblit v1.9.1