diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
index d7e64f7..354f0bf 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
+++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
@@ -176,7 +176,7 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                     Tree tree2 = new Tree();
                     tree2.setLabel(l);
                     tree2.setParentId(tree1.getId());
-                    tree2.setId("zibiaoid-"+l);
+                    tree2.setId(tree1.getId()+":zibiaoid-"+l);
                     tree2.setValue(tree2.getId());
                     treeArrayList.add(tree2);
                 }
@@ -212,9 +212,13 @@ public class CustomerFormServiceImpl implements CustomerFormService {
             //上线修改
             String url = "http://172.20.2.87:7777/customer_form/gainTableField";
             //String url = "http://36.133.126.182:39250/customer_form/gainTableField";
+            if(cfid.contains("zibiaoid-")){
+                cfid = cfid.split(":")[0];//当选择某个主表的子表时，连主表数据一并返回。
+            }
             JSONObject param = new JSONObject();
             param.put("id", cfid);
             String post = null;
+
             System.out.println("requestBody:"+param);
             System.out.println("userKey:"+userKey);
             System.out.println("token:"+token);
@@ -234,15 +238,17 @@ public class CustomerFormServiceImpl implements CustomerFormService {
 
                     tree.setId("formField:"+cfid);
                     tree.setValue("formField:"+cfid);
-                    tree.setLabel("表单-"+cfid);
+                    //tree.setLabel("表单-"+cfid);
+
 
-                    HashMap<String,Object> showMap = new HashMap<>();
-                    showMap.put("show","表单-"+cfid);
-                    tree.setTreeAttrs(showMap);
 
                     ArrayNode masterTableArr = (ArrayNode) data.get("masterTable");
                     JsonNode sunTableArrObj = data.get("sunTable");
+                    JsonNode masterTableName = data.get("masterTableName");
 
+                    HashMap<String,Object> showMap = new HashMap<>();
+                    showMap.put("show",masterTableName.toString().replace("\"",""));
+                    tree.setTreeAttrs(showMap);
 
                     if(!(sunTableArrObj == null)){
                         sunFlag = true;
@@ -403,6 +409,8 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                         }
                         tree.setChildren(masterTreeList);
                     }
+                    System.out.println(masterTableName.toString().replace("\"",""));
+                    tree.setLabel(masterTableName.toString().replace("\"",""));
                 }else{
 
                 }