From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java
index 6020e41..61e74bd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java
@@ -15,6 +15,7 @@
 public class AppVersionInfo {
 	public final static String PLATFORM_ANDROID = "android";
 	public final static String PLATFORM_IOS = "ios";
+	public final static String PLATFORM_XCX = "灏忕▼搴�";
 
 	@Column(name = "avcm_id")
 	private Long id;

--
Gitblit v1.8.0