Merge branch 'developerA' of D:\xuwei_dev\caimei-caimei365-www with conflicts.

src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
+  spiServer: http://192.168.2.67:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com