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

LiuHao

2024-03-08 598ece677dc38ccc4b8e63738e198b669ec05558

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java

@@ -34,7 +34,7 @@
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss")
@RequestMapping("/resource/oss")
public class SysOssController extends BaseController {

    private final ISysOssService ossService;