diff --git a/src/main/java/cn/lihongjie/coal/netDisk/dto/NetDiskDto.java b/src/main/java/cn/lihongjie/coal/netDisk/dto/NetDiskDto.java
index bdcb7db0..26ae1e17 100644
--- a/src/main/java/cn/lihongjie/coal/netDisk/dto/NetDiskDto.java
+++ b/src/main/java/cn/lihongjie/coal/netDisk/dto/NetDiskDto.java
@@ -1,11 +1,12 @@
 package cn.lihongjie.coal.netDisk.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 public class NetDiskDto extends OrgCommonDto {
@@ -15,13 +16,8 @@ public class NetDiskDto extends OrgCommonDto {
     @Comment("条目类型, 文件夹/目录")
     private String entryType;
 
-    @Formula(
-            "(select i.name\n"
-            + "from t_dictionary d,\n"
-            + "     t_dictionary_item i\n"
-            + "where d.id = i.dictionary_id\n"
-            + "  and d.code = 'netDisk.entryType'\n"
-            + "  and i.code = entry_type)")
+  
+    @DictTranslate(dictKey =  DictCode.NETDISK_ENTRYTYPE)
     private String entryTypeName;
 
 
diff --git a/src/main/java/cn/lihongjie/coal/netDisk/entity/NetDiskEntity.java b/src/main/java/cn/lihongjie/coal/netDisk/entity/NetDiskEntity.java
index 401e2a34..b5561302 100644
--- a/src/main/java/cn/lihongjie/coal/netDisk/entity/NetDiskEntity.java
+++ b/src/main/java/cn/lihongjie/coal/netDisk/entity/NetDiskEntity.java
@@ -8,7 +8,6 @@ import jakarta.persistence.*;
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 import java.util.List;
 
@@ -22,14 +21,7 @@ public class NetDiskEntity extends OrgCommonEntity {
     @Comment("条目类型, 文件夹/目录/分片文件")
     private String entryType;
 
-    @Formula(
-            "(select i.name\n"
-                    + "from t_dictionary d,\n"
-                    + "     t_dictionary_item i\n"
-                    + "where d.id = i.dictionary_id\n"
-                    + "  and d.code = 'netDisk.entryType'\n"
-                    + "  and i.code = entry_type)")
-    private String entryTypeName;
+
 
     @OneToMany(
             mappedBy = "parent",
diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/dto/PdcDeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/dto/PdcDeviceSupplierDto.java
index 43124a49..0f94a293 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/dto/PdcDeviceSupplierDto.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/dto/PdcDeviceSupplierDto.java
@@ -1,6 +1,8 @@
 package cn.lihongjie.coal.pdcDeviceSupplier.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import lombok.Data;
 
@@ -8,6 +10,7 @@ import lombok.Data;
 public class PdcDeviceSupplierDto extends OrgCommonDto {
     private String archiveStatus;
 
+    @DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 
     private String contact;
diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/entity/PdcDeviceSupplierEntity.java b/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/entity/PdcDeviceSupplierEntity.java
index 5cf5a3a3..e65a59ab 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/entity/PdcDeviceSupplierEntity.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceSupplier/entity/PdcDeviceSupplierEntity.java
@@ -8,7 +8,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 @Data
 @Entity
@@ -17,14 +16,7 @@ public class PdcDeviceSupplierEntity extends OrgCommonEntity {
     @ColumnDefault("'0'")
     private String archiveStatus = "0";
 
-    @Formula(
-            "(select i.name\n"
-                    + "from t_dictionary d,\n"
-                    + "     t_dictionary_item i\n"
-                    + "where d.id = i.dictionary_id\n"
-                    + "  and d.code = 'archiveStatus'\n"
-                    + "  and i.code = archive_status)")
-    private String archiveStatusName;
+
 
     private String contact;