Merge remote-tracking branch 'origin/master'

Administrator

2023-08-17 20439bc0fa1ff714ed5f61e711272deebb76e2c9

 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java

@@ -46,8 +46,7 @@
    private IArdAppPositionService ardAppPositionService;
    @Autowired
    private ISysUserService sysUserService;
    @Autowired
    private RongCloudService rongCloudService;


    /**
     * 查询app位置列表
@@ -201,7 +200,7 @@
    @ApiOperation("上传文件")
    public AjaxResult uploadFile(MultipartFile file,String type)
    {
        String url = MinioUtils.putObjectAndGetUrl("app1",type, file);
        String url = MinioUtils.putObjectAndGetUrl("app",type, file);
        return AjaxResult.success(url);
    }
}