Merge remote-tracking branch 'origin/qiuqiu'

合并砍价/积分相关 # Conflicts: # consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java # update-sql/version4.2to4.3.sql
2021-07-30 15:50:36 +08:00
parent 8deaef09d7 0cad52cfa6
commit 829472c6a3
57 changed files with 2363 additions and 285 deletions
--- a/config/application.yml
+++ b/config/application.yml
@@ -37,9 +37,6 @@ spring:
  #      replica-set-name: mongoreplset
  cache:
    type: redis
-  #amqp
-  #  rabbitmq:
-  #    host: 192.168.0.116
  jpa:
    # 自动生成表结构
    generate-ddl: true