Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -81,7 +81,7 @@
  # 单节点配置
  singleServerConfig:
    # 客户端名称
    clientName: ${ruoyi-vue-plus.name}
    clientName: ${ruoyi.name}
    # 最小空闲连接数
    connectionMinimumIdleSize: 32
    # 连接池大小