From 0a63d22e38a644bc83b393ed85618b04d3be858b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:22:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java
index 21d525c..3bcc18c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/ESOrder.java
@@ -31,7 +31,7 @@
 	// 浜ゆ槗id
 	@Field(index=true, store = true, type = FieldType.Text)
 	private String tradeId;
-	// 浜ゆ槗骞冲彴
+	// 浜ゆ槗骞冲彴 (1娣樺疂 2浜笢  3鎷煎澶�)
 	@Field(index=true, store = true, type = FieldType.Integer)
 	private Integer platform;
 	

--
Gitblit v1.8.0