From 66c71fb279129d7690957ecbeed87fc8df936708 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 19 Feb 2025 15:27:14 +0800
Subject: [PATCH] Merge branch 'lwx_v17' into lwx_v19

# Conflicts:
#	src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
---
 src/components/DesignForm/tableListPage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 2b34275..2ac3db3 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -522,7 +522,7 @@ const setUpClick = (val: string, id: string) => {
       if(props.formBasicConfig.qrCodeFlag==true){
         if(props.formBasicConfig.qrCodeInside==true){
           if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
-            alert("未选择表格展示字段")
+            alert("未配置表格展示字段")
             return
           }
           const loadingInstance1 = ElLoading.service({