Merge branch 'dev' into dev_cr

zhuo

2025-02-25 a0b5291eb64b13555d4390aba7782eb76dced376

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceTraceabilityManagementController.java

@@ -62,7 +62,7 @@
     * @param deviceTraceabilityManagementDto 量值溯源计划
     */
    @ApiOperation("删除量值溯源计划")
    @GetMapping("/deleteTraceabilityManagement")
    @DeleteMapping("/deleteTraceabilityManagement")
    public Result deleteTraceabilityManagement(DeviceTraceabilityManagementDto deviceTraceabilityManagementDto) {
        return deviceTraceabilityManagementService.deleteTraceabilityManagement(deviceTraceabilityManagementDto);
    }