Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/Constant.java

@@ -67,7 +67,7 @@ public class Constant {
     //APPID
     public final static String APPID = "APPID";
     //默认的appid
-    public final static String DEF_APPID = "wx21d155e8a449d9b1";
+    public final static String DEF_APPID = "wxb0f1112291629413";
 
 //    public class User{
 //        public final static String WORKER_ID_PREFIX = "S210";

mall-miniapp-service/src/main/resources/bootstrap-prd.properties

@@ -81,4 +81,4 @@ inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
-share.mall.appid=wx21d155e8a449d9b1
+share.mall.appid=wxb0f1112291629413

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -82,7 +82,7 @@ inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
-share.mall.appid=wx21d155e8a449d9b1
+share.mall.appid=wxb0f1112291629413
 
 #cmc bank request setting
 cmc.bank.url=https://cdc.cmbchina.com/cdcserver/api/v2