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

# Conflicts:
#	fs-service/src/main/resources/application-druid-bjczwh.yml

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

@@ -55,8 +55,8 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://127.0.0.1:7771
-  h5CommonApi: http://127.0.0.1:7771
+  commonApi: http://192.168.0.194:7771
+  h5CommonApi: http://192.168.0.194:7771
   jwt:
     # 加密秘钥
     secret: bjczwh-bcdefg