From 24fe548756e747bba7d72f17105c59e4572ffc02 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Wed, 18 Mar 2026 17:17:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/dal/mysql/product/ErpProductCategoryMapper.java | 3 ++- .../controller/admin/dict/vo/data/DictDataSaveReqVO.java | 3 +++ .../controller/admin/dict/vo/data/DictDataSimpleRespVO.java | 2 ++ .../yudao/module/system/dal/dataobject/dict/DictDataDO.java | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java index 987d14844..986162ca9 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java @@ -20,8 +20,9 @@ public interface ErpProductCategoryMapper extends BaseMapperX() .likeIfPresent(ErpProductCategoryDO::getName, reqVO.getName()) .eqIfPresent(ErpProductCategoryDO::getStatus, reqVO.getStatus()) + .orderByDesc(ErpProductCategoryDO::getSort) .orderByDesc(ErpProductCategoryDO::getId)); - } + } default ErpProductCategoryDO selectByParentIdAndName(Long parentId, String name) { return selectOne(ErpProductCategoryDO::getParentId, parentId, ErpProductCategoryDO::getName, name); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java index 480475fa3..021dc69f2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java @@ -49,4 +49,7 @@ public class DictDataSaveReqVO { @Schema(description = "备注", example = "我是一个角色") private String remark; + @Schema(description = "字典标签(英文)", example = "btn-visible") + private String labelEn; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java index d1497c345..2d7da0014 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java @@ -22,4 +22,6 @@ public class DictDataSimpleRespVO { @Schema(description = "css 样式", example = "btn-visible") private String cssClass; + @Schema(description = "字典标签(英文)", example = "men") + private String labelEn; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java index 7e2944720..8f4dc7508 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java @@ -61,5 +61,9 @@ public class DictDataDO extends BaseDO { * 备注 */ private String remark; + /** + * 字典标签(英文) + */ + private String labelEn; }