From 21f2f635fefa3dcfd38f364c2a9d50c54360899c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:47:40 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java | 2 +-
1 files changed, 1 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 23165e3..e2db02a 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,7 @@
_9k9("9鍧�9"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia(
"灞呭鐢熸椿"), chuanYiDaPei("绌胯。鎼厤"), meiZhuangGehu("缇庡涓姢"), jingPinXieBao("绮惧搧闉嬪寘"), chaoNanReMai(
- "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("娼搧鐑崠");
+ "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("鏂版娼搧");
private final String desc;
private CommonContentTypeEnum(String desc) {
--
Gitblit v1.8.0