From 30228a7caa447384fe7d0dc64c0c0118d8860a9b Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 10 三月 2020 09:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java | 5 ++++-
1 files changed, 4 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 7a3bf38..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
@@ -2,7 +2,10 @@
public enum CommonContentTypeEnum {
- _9k9("9鍧�9"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia("灞呭鐢熸椿");
+ _9k9("9.9鍖呴偖"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia(
+ "灞呭鐢熸椿"), chuanYiDaPei("绌胯。鎼厤"), meiZhuangGehu("缇庡涓姢"), jingPinXieBao("绮惧搧闉嬪寘"), chaoNanReMai(
+ "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("鏂版娼搧"),mianDan("鍏嶅崟鍟嗗搧")
+ ,guessLikeDevice("鐚滀綘鍠滄");
private final String desc;
private CommonContentTypeEnum(String desc) {
--
Gitblit v1.8.0