Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/Model/weixin/WeiXinUtil.java

@@ -9,8 +9,8 @@ public class WeiXinUtil {
     public static String appid_g = "wx3f20e656effd6400";
     public static String screct_g = "5c30468b960221b1edf443030d20eebc";
     // 民宿商户
-    public static String APIid = "chuanghaikeji1612274012888888888";  // 商户密钥
-    public static String key = "chuanghaikeji1612274012888888888"; // 商户密钥
+    public static String APIid = "gjkgjdkoowpjc46352AqiTTv708poJNV";  // 商户密钥
+    public static String key = "gjkgjdkoowpjc46352AqiTTv708poJNV"; // 商户密钥
     public static String account = "1650403896";  // 商户号
 
     public static String ip = "172.16.20.88";