From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |    3 ++-
 1 files changed, 2 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 accdcdc..840b6bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,6 +24,8 @@
 
 	public final static String UIDAESKEY = "WW782ss@8*px/%2v";
 
+	public final static String ADMINH5_AESKEY = "WW782Ss@0*px/,2v";
+
 	public final static String RANDKEY = "user_randkey";
 	public final static String RANDPWDKEY = "user_pwd_randkey";
 
@@ -42,7 +44,6 @@
 	public final static String HB_STATEEXCEPTION = "绾㈠寘鐘舵�佸紓甯�";
 	public final static String HB_NOEXIST = "绾㈠寘涓嶅瓨鍦�";
 	public static final int MR_COUNT = 2;
-	public static final String HONGBAO_GOODS_PROPORTION = "hongbao_goods_proportion";
 
 	public final static String BA_EXIST = "璇ョ被鍨嬭处鎴峰凡瀛樺湪";
 	public final static String BA_SUCCESS = "鍒涘缓鎴愬姛";

--
Gitblit v1.8.0