conflicts

src/main/resources/application-prod.properties

@@ -3,7 +3,7 @@
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
-spring.redis.password=
+spring.redis.password=areowqr!@43ef
 spring.redis.timeout=1000ms
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1ms
@@ -20,7 +20,7 @@ spring.rabbitmq.password=111111
 # MongoDB\u914D\u7F6E\u4FE1\u606F
 
 spring.data.mongodb.uri=mongodb://wei:111111@127.0.0.1:27017/test
->>>>>>> b14da04bd45b468e9caa026461c4a75fb2030eb1
+#>>>>>>> b14da04bd45b468e9caa026461c4a75fb2030eb1
 
 # Settings
 setting.snowflake.workerId=1