Merge remote-tracking branch 'origin/master'

sinake

昨天 533ffe54ffc7f0f39b9df8f7d99fee4880b50952

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java

@@ -92,7 +92,11 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDeathinfo serviceDeathinfo) {
        return toAjax(serviceDeathinfoService.save(serviceDeathinfo));
        Boolean result= serviceDeathinfoService.save(serviceDeathinfo);
        if (result) {
            return AjaxResult.success(serviceDeathinfo.getId());
        } else
            return AjaxResult.error();
    }

    /**