From d6c8cce305427ba64005d4e349e169446e0d1801 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 09:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dto/common/PDDCommonContentTypeEnum.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/common/PDDCommonContentTypeEnum.java b/fanli/src/main/java/com/yeshi/fanli/dto/common/PDDCommonContentTypeEnum.java
index ba5071e..7a01407 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/common/PDDCommonContentTypeEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/common/PDDCommonContentTypeEnum.java
@@ -2,7 +2,7 @@
 
 public enum PDDCommonContentTypeEnum {
 
-	_1k9("1.9鍖呴偖", "0"), todayTop("浠婃棩鐖嗘", "1"), brandClear("鍝佺墝娓呬粨", "2"), brandGoods("鍝佺墝濂借揣", null);
+	_1k9("1.9鍖呴偖", "0"), todayTop("浠婃棩鐖嗘", "1"), brandClear("鍝佺墝娓呬粨", "2"), hotSaleGoods("鐑崠鐖嗘", null);
 	private final String desc;
 	private final String content;
 	

--
Gitblit v1.8.0