Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-01 6cebcdd663ac06a6a8aa931058a515aa38a14bc3

 flower_city/src/main/resources/application.properties

@@ -13,6 +13,7 @@
#Redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.database=2
spring.redis.password=nahanRedisPwsIsVerySimple&&