From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期六, 03 八月 2019 12:13:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 98abda3..e3d530b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -196,7 +196,7 @@
 
 		if (znxConfig == null) {
 			Properties ps = org.yeshi.utils.PropertiesUtil
-					.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("znx_msg.properties"));
+					.getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("push_msg.properties"));
 			znxConfig = (ZNXConfig) MapUtil.parseMap(ZNXConfig.class, ps);
 		}
 

--
Gitblit v1.8.0