diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index d0d6a8b2c..e28c47645 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -34,8 +34,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 <#assign bpm_flag=false>
@@ -73,7 +73,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -104,7 +104,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
 	@RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -122,7 +122,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
 	@RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -137,7 +137,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
 	@RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -152,7 +152,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
 	@RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -167,7 +167,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 2b5e5ebd6..5b9f134fc 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -17,7 +17,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 52f6a1171..be4ca9dd7 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -339,7 +339,7 @@
  <#list columns as po>
     <#if po.isQuery=='Y' || po.isShowList=='Y'>
       <#if po.classType=='popup_dict' && list_has_popup_dict==true>
-      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item.split(',')))];
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
       if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
        const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
        records.forEach((item) => {
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index b1908553b..5cbb6ca9d 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -172,6 +172,10 @@
 <#if need_pca>
   import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
 </#if>
+  <#if need_popup_dict>
+ import {getPopDictByCode} from "@/utils/dict";
+ import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+  </#if>
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
@@ -204,6 +208,9 @@
         return Object.assign(params, queryParam);
        </#if>
       },
+      <#if need_popup_dict>
+      afterFetch: afterFetch
+      </#if>
     },
     exportConfig: {
       name: "${tableVo.ftlDescription}",
@@ -465,6 +472,28 @@
     return queryParamClone;
   }
   </#if>
+
+ <#if need_popup_dict>
+ /**
+  * 翻译Popup字典配置
+ */
+  async function afterFetch(records){
+<#list columns as po>
+  <#if po.isQuery=='Y' || po.isShowList=='Y'>
+    <#if po.classType=='popup_dict'>
+    const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+    if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+     const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+     records.forEach((item) => {
+       item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+     });
+    }
+    </#if>
+  </#if>
+</#list>
+   return records;
+ }
+  </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index 94ae4c4e1..00ee5fc49 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -42,8 +42,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 <#assign bpm_flag=false>
@@ -81,7 +81,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -100,7 +100,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
 	@RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -120,7 +120,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
 	@RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -141,7 +141,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
 	@RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -156,7 +156,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
 	@RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -171,7 +171,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
@@ -190,7 +190,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${sub.ftlDescription}通过主表ID查询")
-	@Operation(summary = "${sub.ftlDescription}-通主表ID查询")
+	@Operation(summary="${sub.ftlDescription}主表ID查询")
 	@GetMapping(value = "/query${sub.entityName}ByMainId")
 	public Result<List<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) {
 		List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 89b8e05b8..d5e992bf8 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,7 +15,6 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-
 /**
  * @Description: ${tableVo.ftlDescription}
  * @Author: jeecg-boot
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 04fea51b7..e4b78b96c 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -14,7 +14,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
index 081d760a5..b34674e2a 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -15,7 +15,6 @@ import java.util.Date;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-
 /**
  * @Description: ${tableVo.ftlDescription}
  * @Author: jeecg-boot
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index 9a81fa05f..e828ed6dc 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -33,8 +33,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
@@ -68,7 +68,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/rootList")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -164,7 +164,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
       * @return
       */
 	//@AutoLog(value = "${tableVo.ftlDescription}-获取子数据")
-	@Operation(summary = "${tableVo.ftlDescription}-获取子数据")
+	@Operation(summary="${tableVo.ftlDescription}-获取子数据")
 	@GetMapping(value = "/childList")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},HttpServletRequest req) {
 		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
@@ -182,7 +182,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
       * @return
       */
 	//@AutoLog(value = "${tableVo.ftlDescription}-批量获取子数据")
-    @Operation(summary = "${tableVo.ftlDescription}-批量获取子数据")
+    @Operation(summary="${tableVo.ftlDescription}-批量获取子数据")
     @GetMapping("/getChildListBatch")
     public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
         try {
@@ -206,7 +206,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
     @RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -221,7 +221,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
     @RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -236,7 +236,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
     @RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -251,7 +251,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
     @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -266,7 +266,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 26ae6d641..72b43a804 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index c340d804a..5f187c4d9 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -2,6 +2,7 @@
 <#assign pidFieldName = "">
 <#assign hasChildrenField = "">
 <#assign bpm_flag=false>
+<#assign list_has_popup_dict=false>
 <#list originalColumns as po>
   <#if po.fieldDbName == tableVo.extendParams.pidField>
     <#assign pidFieldName = po.fieldName>
@@ -19,6 +20,9 @@
 <#if po.classType=='pca'>
 <#assign list_need_pca=true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign list_has_popup_dict=true>
+</#if>
 </#list>
 <template>
   <div>
@@ -93,6 +97,10 @@
   <#if list_need_pca>
   import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
   </#if>
+  <#if list_has_popup_dict>
+   import {getPopDictByCode} from "@/utils/dict";
+   import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+  </#if>
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
@@ -150,6 +158,9 @@
            params.hasQuery = "true"; 
            return Object.assign(params, queryParam);
          },
+         <#if list_has_popup_dict>
+         afterFetch: afterFetch
+         </#if>
     },
      exportConfig: {
           name:"${tableVo.ftlDescription}",
@@ -442,7 +453,27 @@
     await reload();
   }
   </#if>
-
+ <#if list_has_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && list_has_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+    </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index cb2f78c94..b5c90ff45 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -181,6 +181,10 @@
 <#if need_pca>
   import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
 </#if>
+  <#if need_popup_dict>
+ import {getPopDictByCode} from "@/utils/dict";
+ import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+  </#if>
 <#if is_range>
   import { cloneDeep } from "lodash-es";
 </#if>
@@ -214,6 +218,9 @@
         return Object.assign(params, queryParam.value);
        </#if>
       },
+      <#if need_popup_dict>
+      afterFetch: afterFetch
+      </#if>
     },
     exportConfig: {
       name: "${tableVo.ftlDescription}",
@@ -623,6 +630,28 @@
     return queryParamClone;
   }
   </#if>
+
+   <#if need_popup_dict>
+     /**
+      * 翻译Popup字典配置
+     */
+      async function afterFetch(records){
+   <#list columns as po>
+      <#if po.isQuery=='Y' || po.isShowList=='Y'>
+        <#if po.classType=='popup_dict'>
+        const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+        if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+         const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+         records.forEach((item) => {
+           item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+         });
+        }
+        </#if>
+      </#if>
+   </#list>
+       return records;
+     }
+  </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index 528fa9f94..d957608c6 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -24,8 +24,8 @@ import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
 <#list subTables as sub>
 import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service;
 </#list>
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
@@ -79,7 +79,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -109,7 +109,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
      * @return
      */
     @AutoLog(value = "${tableVo.ftlDescription}-添加")
-    @Operation(summary = "${tableVo.ftlDescription}-添加")
+    @Operation(summary="${tableVo.ftlDescription}-添加")
     @RequiresPermissions("${entityPackage}:${tableName}:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -123,7 +123,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
      * @return
      */
     @AutoLog(value = "${tableVo.ftlDescription}-编辑")
-    @Operation(summary = "${tableVo.ftlDescription}-编辑")
+    @Operation(summary="${tableVo.ftlDescription}-编辑")
     @RequiresPermissions("${entityPackage}:${tableName}:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
     public Result<String> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
@@ -137,7 +137,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
      * @return
      */
     @AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-    @Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+    @Operation(summary="${tableVo.ftlDescription}-通过id删除")
     @RequiresPermissions("${entityPackage}:${tableName}:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -151,7 +151,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
      * @return
      */
     @AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-    @Operation(summary = "${tableVo.ftlDescription}-批量删除")
+    @Operation(summary="${tableVo.ftlDescription}-批量删除")
     @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -188,7 +188,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	//@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询")
-	@Operation(summary = "${sub.ftlDescription}-通过主表ID查询")
+	@Operation(summary="${sub.ftlDescription}-通过主表ID查询")
 	@GetMapping(value = "/list${sub.entityName}ByMainId")
     public Result<IPage<${sub.entityName}>> list${sub.entityName}ByMainId(${sub.entityName} ${sub.entityName?uncap_first},
                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -206,7 +206,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${sub.ftlDescription}-添加")
-	@Operation(summary = "${sub.ftlDescription}-添加")
+	@Operation(summary="${sub.ftlDescription}-添加")
 	@PostMapping(value = "/add${sub.entityName}")
 	public Result<String> add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) {
 		${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first});
@@ -219,7 +219,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${sub.ftlDescription}-编辑")
-	@Operation(summary = "${sub.ftlDescription}-编辑")
+	@Operation(summary="${sub.ftlDescription}-编辑")
 	@RequestMapping(value = "/edit${sub.entityName}", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) {
 		${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first});
@@ -232,7 +232,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${sub.ftlDescription}-通过id删除")
-	@Operation(summary = "${sub.ftlDescription}-通过id删除")
+	@Operation(summary="${sub.ftlDescription}-通过id删除")
 	@DeleteMapping(value = "/delete${sub.entityName}")
 	public Result<String> delete${sub.entityName}(@RequestParam(name="id",required=true) String id) {
 		${sub.entityName?uncap_first}Service.removeById(id);
@@ -245,7 +245,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e
 	 * @return
 	 */
 	@AutoLog(value = "${sub.ftlDescription}-批量删除")
-	@Operation(summary = "${sub.ftlDescription}-批量删除")
+	@Operation(summary="${sub.ftlDescription}-批量删除")
 	@DeleteMapping(value = "/deleteBatch${sub.entityName}")
 	public Result<String> deleteBatch${sub.entityName}(@RequestParam(name="ids",required=true) String ids) {
 	    this.${sub.entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 8ca7f744c..445426c07 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,8 +15,8 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 618582295..46fc3f6f0 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 23a37ad91..37894b29e 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -3,7 +3,7 @@
 <#assign list_need_category=false>
 <#assign list_need_pca=false>
 <#assign bpm_flag=false>
-
+<#assign list_has_popup_dict=false>
 <#-- 开始循环 -->
 <#list columns as po>
 <#if po.fieldDbName=='bpm_status'>
@@ -15,6 +15,9 @@
 <#if po.classType=='pca'>
 <#assign list_need_pca=true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign list_has_popup_dict=true>
+</#if>
 </#list>
 <#-- 结束循环 -->
     <div class="content">
@@ -103,6 +106,10 @@
   import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
   </#if>
   <#if list_need_category>
+<#if list_has_popup_dict>
+  import {getPopDictByCode} from "@/utils/dict";
+  import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+</#if>
   import { loadCategoryData } from '/@/api/common/api'
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
@@ -158,6 +165,9 @@
            beforeFetch: (params) => {
              return Object.assign(params, queryParam);
            },
+            <#if list_has_popup_dict>
+           afterFetch: afterFetch,
+           </#if>
            pagination:{
                current: 1,
                pageSize: 5,
@@ -341,6 +351,28 @@
    }
    initDictConfig();
     </#if>
+
+<#if list_has_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && list_has_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+</#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 480c3302a..487013fce 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -198,6 +198,10 @@
   <#if is_range>
   import { cloneDeep } from "lodash-es";
   </#if>
+<#if need_popup_dict>
+  import {getPopDictByCode} from "@/utils/dict";
+  import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+</#if>
   const formRef = ref();
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
@@ -225,6 +229,9 @@
         return Object.assign(params, queryParam);
        </#if>
       },
+      <#if need_popup_dict>
+      afterFetch: afterFetch,
+      </#if>
       pagination: {
         current: 1,
         pageSize: 5,
@@ -419,7 +426,27 @@
   }
   initDictConfig();
  </#if>
-
+<#if need_popup_dict>
+    /**
+    * 翻译Popup字典配置
+    */
+    async function afterFetch(records){
+    <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && need_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+    </#list>
+     return records;
+}
+</#if>
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index d8edde595..284707347 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 <#assign has_multi_query_field=false>
@@ -82,7 +82,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -113,7 +113,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
     @RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -130,7 +130,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
     @RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -151,7 +151,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
     @RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -166,7 +166,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
     @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -181,7 +181,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
@@ -200,7 +200,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${sub.ftlDescription}-通过主表ID查询")
-	@Operation(summary = "${sub.ftlDescription}-通过主表ID查询")
+	@Operation(summary="${sub.ftlDescription}-通过主表ID查询")
 	@GetMapping(value = "/query${sub.entityName}ByMainId")
 	public Result<IPage<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) {
 		List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 64dfde34d..66db82ce4 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index cbd4c657e..63467f5a5 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -16,8 +16,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
index c13ab990a..218e48993 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -15,8 +15,8 @@ import java.util.Date;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 13ef9e92d..3eb50a46b 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -6,6 +6,7 @@
 <#assign list_need_category=false>
 <#assign list_need_pca=false>
 <#assign bpm_flag=false>
+<#assign list_has_popup_dict=false>
 
 <#-- 开始循环 -->
 <#list columns as po>
@@ -18,6 +19,9 @@
 <#if po.classType=='pca'>
 <#assign list_need_pca=true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign list_has_popup_dict=true>
+</#if>
 </#list>
 <#-- 结束循环 -->
     <!--引用表格-->
@@ -111,6 +115,10 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  <#if list_has_popup_dict>
+   import {getPopDictByCode} from "@/utils/dict";
+   import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+  </#if>
   import { useUserStore } from '/@/store/modules/user';
   const queryParam = reactive<any>({});
    // 展开key
@@ -164,6 +172,9 @@
            beforeFetch: (params) => {
              return Object.assign(params, queryParam);
            },
+           <#if list_has_popup_dict>
+           afterFetch: afterFetch
+           </#if>
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
@@ -348,6 +359,28 @@
    }
    initDictConfig();
     </#if>
+
+    <#if list_has_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && list_has_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+    </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index faae6c93b..37f1675c7 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
@@ -91,7 +91,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -122,7 +122,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
     @RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -142,7 +142,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
     @RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -163,7 +163,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
     @RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -178,7 +178,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
     @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -193,7 +193,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
@@ -212,7 +212,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${sub.ftlDescription}通过主表ID查询")
-	@Operation(summary = "${sub.ftlDescription}-通主表ID查询")
+	@Operation(summary="${sub.ftlDescription}主表ID查询")
 	@GetMapping(value = "/query${sub.entityName}ByMainId")
 	public Result<List<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) {
 		List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 76c348821..4754897be 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 68b826f4d..9bc3f3a22 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -16,7 +16,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
index 541236b99..c34e18bd2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -15,8 +15,8 @@ import java.util.Date;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index c9257313a..5cec015b7 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -3,7 +3,7 @@
 <#assign list_need_category=false>
 <#assign list_need_pca=false>
 <#assign bpm_flag=false>
-
+<#assign list_has_popup_dict=false>
 <#-- 开始循环 -->
 <#list columns as po>
 <#if po.fieldDbName=='bpm_status'>
@@ -15,6 +15,9 @@
 <#if po.classType=='pca'>
 <#assign list_need_pca=true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign list_has_popup_dict=true>
+</#if>
 </#list>
 <#-- 结束循环 -->
     <!--引用表格-->
@@ -92,6 +95,10 @@
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
   </#if>
+<#if list_has_popup_dict>
+  import {getPopDictByCode} from "@/utils/dict";
+  import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+</#if>
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
@@ -146,6 +153,9 @@
            beforeFetch: (params) => {
              return Object.assign(params, queryParam);
            },
+           <#if list_has_popup_dict>
+           afterFetch: afterFetch
+           </#if>
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
@@ -321,6 +331,28 @@
    }
    initDictConfig();
     </#if>
+
+    <#if list_has_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && list_has_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+    </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index d90a4b076..1de9d2c1c 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -182,6 +182,10 @@
   <#if is_range>
   import { cloneDeep } from "lodash-es";
   </#if>
+<#if need_popup_dict>
+  import {getPopDictByCode} from "@/utils/dict";
+  import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+</#if>
   import { useUserStore } from '/@/store/modules/user';
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -209,6 +213,9 @@
              return Object.assign(params, queryParam);
             </#if>
            },
+           <#if need_popup_dict>
+           afterFetch: afterFetch,
+           </#if>
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
@@ -394,6 +401,27 @@
    initDictConfig();
     </#if>
 
+    <#if need_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict'>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+    </#if>
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index fd0aca7dd..4032647d2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -44,8 +44,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 <#assign has_multi_query_field=false>
@@ -82,7 +82,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@Operation(summary = "${tableVo.ftlDescription}-分页列表查询")
+	@Operation(summary="${tableVo.ftlDescription}-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -113,7 +113,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@Operation(summary = "${tableVo.ftlDescription}-添加")
+	@Operation(summary="${tableVo.ftlDescription}-添加")
     @RequiresPermissions("${entityPackage}:${tableName}:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -130,7 +130,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@Operation(summary = "${tableVo.ftlDescription}-编辑")
+	@Operation(summary="${tableVo.ftlDescription}-编辑")
     @RequiresPermissions("${entityPackage}:${tableName}:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
@@ -151,7 +151,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id删除")
+	@Operation(summary="${tableVo.ftlDescription}-通过id删除")
     @RequiresPermissions("${entityPackage}:${tableName}:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -166,7 +166,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@Operation(summary = "${tableVo.ftlDescription}-批量删除")
+	@Operation(summary="${tableVo.ftlDescription}-批量删除")
     @RequiresPermissions("${entityPackage}:${tableName}:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -181,7 +181,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@Operation(summary = "${tableVo.ftlDescription}-通过id查询")
+	@Operation(summary="${tableVo.ftlDescription}-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
 		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
@@ -200,7 +200,7 @@ public class ${entityName}Controller {
 	 * @return
 	 */
 	//@AutoLog(value = "${sub.ftlDescription}通过主表ID查询")
-	@Operation(summary = "${sub.ftlDescription}-通主表ID查询")
+	@Operation(summary="${sub.ftlDescription}主表ID查询")
 	@GetMapping(value = "/query${sub.entityName}ByMainId")
 	public Result<List<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) {
 		List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id);
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 30931ac01..869049a05 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 68b826f4d..5ca5b45e0 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
index a8182f865..c8550f84d 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -15,8 +15,8 @@ import java.util.Date;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * @Description: ${tableVo.ftlDescription}
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 60ee04bd3..43a0ce326 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -3,7 +3,7 @@
 <#assign list_need_category=false>
 <#assign list_need_pca=false>
 <#assign bpm_flag=false>
-
+<#assign list_has_popup_dict=false>
 <#-- 开始循环 -->
 <#list columns as po>
 <#if po.fieldDbName=='bpm_status'>
@@ -15,6 +15,9 @@
 <#if po.classType=='pca'>
 <#assign list_need_pca=true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign list_has_popup_dict=true>
+</#if>
 </#list>
 <#-- 结束循环 -->
     <!--引用表格-->
@@ -92,6 +95,10 @@
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
   </#if>
+<#if list_has_popup_dict>
+  import {getPopDictByCode} from "@/utils/dict";
+  import {filterMultiDictText} from "@/utils/dict/JDictSelectUtil";
+</#if>
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
@@ -146,6 +153,9 @@
            beforeFetch: (params) => {
              return Object.assign(params, queryParam);
            },
+           <#if list_has_popup_dict>
+           afterFetch: afterFetch
+           </#if>
         },
         exportConfig: {
             name:"${tableVo.ftlDescription}",
@@ -320,6 +330,28 @@
    }
    initDictConfig();
     </#if>
+
+    <#if list_has_popup_dict>
+   /**
+    * 翻译Popup字典配置
+   */
+    async function afterFetch(records){
+ <#list columns as po>
+    <#if po.isQuery=='Y' || po.isShowList=='Y'>
+      <#if po.classType=='popup_dict' && list_has_popup_dict==true>
+      const ${po.fieldName}Keys = [...new Set(records.map((item) => item['${po.fieldName}']).flatMap((item) => item && item.split(',')))];
+      if(${po.fieldName}Keys && ${po.fieldName}Keys.length){
+       const dictOptions = await getPopDictByCode(${po.fieldName}Keys.join(','), '${po.dictTable},${po.dictField},${po.dictText}');
+       records.forEach((item) => {
+         item['${po.fieldName}_dictText'] = filterMultiDictText(dictOptions, item['${po.fieldName}']);
+       });
+      }
+      </#if>
+    </#if>
+ </#list>
+     return records;
+   }
+    </#if>
 </script>
 
 <style lang="less" scoped>