!8 sync 同步ruoyi-vue-plus更新

fix -- 修复代码生成页面错误bug
fix -- 调整返回类型为R，修正脚本

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
@@ -15,9 +16,9 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, Sys
 
     default List<SysDictData> selectDictDataByType(String dictType) {
         return selectList(
-                new LambdaQueryWrapper<SysDictData>()
-                        .eq(SysDictData::getStatus, "0")
-                        .eq(SysDictData::getDictType, dictType)
-                        .orderByAsc(SysDictData::getDictSort));
+            new LambdaQueryWrapper<SysDictData>()
+                .eq(SysDictData::getStatus, UserConstants.DICT_NORMAL)
+                .eq(SysDictData::getDictType, dictType)
+                .orderByAsc(SysDictData::getDictSort));
     }
 }