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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -63,7 +63,7 @@ public class CommonLogic {
     private String clientSecret;
 
     //高德的webkey
-    private final String mapWebKey = "69cebe7cded9307a588237b0618856c9";
+    private final String mapWebKey = "428a7111e02ea8367a3b34804eaa025b";
 
     public CurrentCompanyWechat getCurrentCompanyWechat(){
         HttpServletRequest request = ApplicationContextUtils.getHttpServletRequest();