Merge remote-tracking branch 'origin/master'

# Conflicts:
#	caimei365-cloud-order/order-beta.yml

caimei365-cloud-order/order-dev.yml

@@ -84,8 +84,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75

caimei365-cloud-order/order-prod.yml

@@ -91,7 +91,6 @@ wx:
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75
 
-
 pay:
   # 支付链接重定向地址
   redirect-link: https://core.caimei365.com/order/pay/link/jump

caimei365-cloud-user/user-beta.yml

@@ -70,8 +70,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75

caimei365-cloud-user/user-dev.yml

@@ -68,8 +68,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75

caimei365-cloud-user/user-prod.yml

@@ -70,8 +70,8 @@ wx:
   mini-app-id: wxf3cd4ae0cdd11c36
   mini-app-secret: f5707c40c07adf0e2110c58ce6a4f4b3
   #crm公众号信息
-  crm-app-id: wxea43a0f9ebce9e66
-  crm-app-secret: 1c3cd60908e72dd280840bee9e15f7f6
+  crm-app-id: wx91c4152b60ca91a3
+  crm-app-secret: a563dd2c07c9c815a4e697c8b6cb73dc
   #呵呵商城小程序信息
   hehe-app-id: wx2c3b0a7f343235b1
   hehe-app-secret: 1bb87882ee85a0411923d7f56c7dde75