From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
index cc1647c..761dd2a 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
@@ -30,6 +30,10 @@
 	 * 分销单状态2已结算
 	 */
 	public static final Integer STATUS_YJS = 2;
+	/**
+	 * 分销单状态3已退款
+	 */
+	public static final Integer STATUS_YTK = 3;
 
 
 	@Extend
@@ -75,10 +79,8 @@
 	private Double  amount;
 	
 	/**
-	 * 结算状态
+	 * 结算状态 1，待结算，2，已结算，3已退款
 	 */
-
-
 	private Integer  orderStatus;
 	
 	/**

--
Gitblit v1.9.1