From 6b75391e97aa770e12965ec6e542856df79e6de0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2019 15:14:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java b/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java
index 1902d1b..8273c3f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java
@@ -4,7 +4,8 @@
_9k9("9.9鍖呴偖"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia(
"灞呭鐢熸椿"), chuanYiDaPei("绌胯。鎼厤"), meiZhuangGehu("缇庡涓姢"), jingPinXieBao("绮惧搧闉嬪寘"), chaoNanReMai(
- "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("鏂版娼搧"),mianDan("鍏嶅崟鍟嗗搧");
+ "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("鏂版娼搧"),mianDan("鍏嶅崟鍟嗗搧")
+ ,guessLikeDevice("鐚滀綘鍠滄");
private final String desc;
private CommonContentTypeEnum(String desc) {
--
Gitblit v1.8.0