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

yaowanxin

2 天以前 17a7110753d9efeeaca28d7869fec4d084fc2d46

 src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java

@@ -66,7 +66,7 @@
    @GetMapping(value = "/{dictCode}")

    public AjaxResult getInfo(@PathVariable Long dictCode)

    {

        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));

        return success(dictDataService.selectDictDataById(dictCode));

    }



    /**

@@ -80,7 +80,7 @@
        {

            data = new ArrayList<SysDictData>();

        }

        return AjaxResult.success(data);

        return success(data);

    }



    /**