From 72396cbbb60d0418dd4cb63f310532fc70a28c10 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 17:59:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
index 176f3d8..66a9dc1 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
@@ -15,9 +15,20 @@
 public class ShopSalemanSettlement  extends BaseEntity {
 	@Extend
 	private static final long serialVersionUID = 1L; 
-
+	/**
+	 * 结算编号头部编码
+	 */
+    public static final String ORDERNO_START = "J";
 	
+	/**
+	 * 结算方式 1 线下结算
+	 */
+    public static final Integer SETTLEMENTWAY_XXJS = 1;
 
+	/**
+	 * 结算方式 2 微信余额结算
+	 */
+	public static final Integer SETTLEMENTWAY_YEJS = 2;
 
 	
 	/**

--
Gitblit v1.9.1