From 1837720b1fcc164e594df34f8590a594dfa2a8e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:35:14 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java | 4 +++-
1 files changed, 3 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..5ec9d73 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,9 @@
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("杩愬姩閰烽瀷");
private final String desc;
private CommonContentTypeEnum(String desc) {
--
Gitblit v1.8.0