Merge branch '3.5'

src/main/java/com/gogirl/domain/user/customer/Customer.java

@@ -100,7 +100,7 @@ public class Customer implements Serializable {
     @ApiModelProperty("数据完整度")
     private Double dataIntegrity;
 
-    @ApiModelProperty("1, 大众 2,朋友介绍3, 自来 4,微信 5:街客 6：线上活动 7,街客（逛街）8,街客（附近上班）9, 街客（住附近）")
+    @ApiModelProperty("1, 大众 2,朋友介绍3, 自来 4,微信 5:街客 6：线上活动 7,街客（逛街）8,街客（附近上班）9, 街客（住附近）10,其他")
     private Integer customerSource;
 
     @ApiModelProperty("1,新建预约2,新建订单3,微信端授权'")

src/main/resources/application-dev.yml

@@ -43,7 +43,7 @@ spring:
 
   #redis配置
   redis:
-    host: host.docker.internal
+    host: 127.0.0.1
     port: 6379
     database: 0
     lettuce:

src/main/resources/application-prod.yml

@@ -43,7 +43,7 @@ spring:
 
   #redis配置
   redis:
-    host: host.docker.internal
+    host: 127.0.0.1
     port: 6378
     database: 0
     lettuce:

src/main/resources/application-test.yml

@@ -43,7 +43,7 @@ spring:
 
   #redis配置
   redis:
-    host: host.docker.internal
+    host: 127.0.0.1
     port: 6379
     database: 0
     lettuce: