商城代码合并到master

fs-company/src/main/resources/application.yml

@@ -11,4 +11,4 @@ spring:
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-    active: druid-hzyy
+    active: dev