Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/application-config-dev-jnlzjk.yml

@@ -90,5 +90,12 @@ ipad:
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:
+qw:
+  enableAutoTag: 1
+tag:
+  thread:
+    num: 5
+  rate:
+    limit: 30
 
 

fs-service/src/main/resources/application-config-druid-jnlzjk.yml

@@ -98,12 +98,5 @@ ipad:
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:
-qw:
-  enableAutoTag: 1
-tag:
-  thread:
-    num: 5
-  rate:
-    limit: 30
 
 

fs-service/src/main/resources/application-druid-jnlzjk.yml

@@ -155,5 +155,11 @@ im:
     type: NONE
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: false
-
+qw:
+    enableAutoTag: 1
+tag:
+    thread:
+        num: 5
+    rate:
+        limit: 30