Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-01 5f866906d1d14b2b3f2123a49270458c12fecf7e

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

@@ -21,6 +21,7 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysDictTypeService;

/**
 * 数据字典信息
@@ -33,6 +34,9 @@
{
    @Autowired
    private ISysDictDataService dictDataService;

    @Autowired
    private ISysDictTypeService dictTypeService;

    @PreAuthorize("@ss.hasPermi('system:dict:list')")
    @GetMapping("/list")
@@ -66,10 +70,10 @@
    /**
     * 根据字典类型查询字典数据信息
     */
    @GetMapping(value = "/dictType/{dictType}")
    @GetMapping(value = "/type/{dictType}")
    public AjaxResult dictType(@PathVariable String dictType)
    {
        return AjaxResult.success(dictDataService.selectDictDataByType(dictType));
        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
    }

    /**