From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 3301081..1953f43 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,9 +2,9 @@
public enum CommonContentTypeEnum {
- _9k9("9鍧�9"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia(
- "灞呭鐢熸椿"), chuanYiDaPei("绌胯。鎼厤"), meiZhuangGehu("缇庡涓姢"), jingPinXieBao(
- "绮惧搧闉嬪寘"), chaoNanReMai("娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰");
+ _9k9("9.9鍖呴偖"), haoQuan("楂橀濂藉埜"), chaoSheng("瓒呯骇鐪侀挶"), muYin("姣嶅┐绮鹃��"), reMai("娼搧鐑崠"), meiShi("浼橀�夌編椋�"), juJia(
+ "灞呭鐢熸椿"), chuanYiDaPei("绌胯。鎼厤"), meiZhuangGehu("缇庡涓姢"), jingPinXieBao("绮惧搧闉嬪寘"), chaoNanReMai(
+ "娼敺鐑崠"), shuMaShouJi("鏁扮爜鎵嬫満"), yunDongKuXie("杩愬姩閰烽瀷"), qiCheHuWai("姹借溅鎴峰"), chaoPinReMai("鏂版娼搧");
private final String desc;
private CommonContentTypeEnum(String desc) {
--
Gitblit v1.8.0