Merge remote-tracking branch 'origin/master'

zss

2 天以前 cdc16c48e3130408d3689afc134ee312c35347b8

Merge remote-tracking branch 'origin/master'

 src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java

@@ -42,6 +42,11 @@

    @Override
    public int deleteSalesLedgerByIds(Long[] ids) {
       for (Long id : ids) {
           if (id == null) {
               return 1;
           }
       }
        return commonFileMapper.deleteBatchIds(Arrays.asList(ids));
    }


 src/main/resources/application.yml

@@ -58,14 +58,14 @@
  servlet:
    multipart:
      # 单个文件大小
      max-file-size: 10MB
      max-file-size: 1GB
      # 设置总上传的文件大小
      max-request-size: 20MB
      max-request-size: 2GB
  # 服务模块
  devtools:
    restart:
      # 热部署开关
      enabled: true
      enabled: false
  # redis 配置
  redis:
    # 地址
@@ -75,7 +75,9 @@
    # 数据库索引
    database: 0
    # 密码
#    password: root2022!
    password: root2022!
#    password: 123456

    # 连接超时时间
    timeout: 10s
    lettuce: