From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index 0217131..b61dbf9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -1,5 +1,6 @@
 package com.matrix.system.hive.bean;
 
+import com.matrix.core.anotations.Extend;
 import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -24,6 +25,8 @@
 	 * 订单类型-退款订单
 	 */
 	public static final int ORDER_TYPE_REFUND= 2;
+
+
 
 	/**
 	 * 序号
@@ -56,6 +59,12 @@
 	 * 员工编号(美容顾问) 下单人id
 	 */
 	private Long staffId;
+	/**
+	 * 收银员姓名
+	 */
+	@Extend
+	private String cashierName;
+
 
 	/**
 	 * 收银员
@@ -147,10 +156,7 @@
 	/* 会员手机号
 	 */
 	private String vipPhone;
-	/**
-	 * 收银员姓名
-	 */
-	private String cashierName;
+
 
 	private	String staffName;
 	

--
Gitblit v1.9.1