Merge remote-tracking branch 'origin/master'

16639036659

2023-07-13 aa9c34737dd81d3ed4ed05b5f52b7edd8d14dee2

 src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java

@@ -107,7 +107,7 @@
    public String edit(@PathVariable("id") Long id, ModelMap mmap)

    {

        PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id);

        mmap.put("overhaulLogById",overhaulLogById);

        mmap.put("overhaulLog",overhaulLogById);

        List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();

        mmap.put("riskUnits", respDTOS);

        return prefix + "/edit";