From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
index c48147b..74185e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
@@ -22,7 +22,7 @@
 	public final static int STATE_SX = 4;// 鏈粯娆�/宸查��娆�
 
 	public enum MsgTypeOrderTypeEnum {
-		fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�"), found("璁㈠崟鎵惧洖"),elme("楗夸簡涔堣鍗�");
+		fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�"), found("璁㈠崟鎵惧洖"), elme("楗夸簡涔堣鍗�");
 		private final String desc;
 
 		private MsgTypeOrderTypeEnum(String desc) {

--
Gitblit v1.8.0