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/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