Merge branch '202407-2' into dev

src/views/system/fieldOpt/List.vue

@@ -105,7 +105,7 @@ export default {
       rightHeight: document.documentElement.clientHeight - 180,
       tableList: [
         { label: "服务类型", field: "name" },
-        { label: "所属类型", field: "custom1" },
+        { label: "所属类型", field: "custom1Txt" },
         { label: "状态", field: "status" },
         { label: "备注", field: "remark" },
         { label: "操作", field: "active" },
@@ -217,7 +217,7 @@ export default {
       if (val.code === "serviceType") {
         this.tableList = [
           { label: "服务类型", field: "name" },
-          { label: "所属类型", field: "custom1" },
+          { label: "所属类型", field: "custom1Txt" },
           { label: "状态", field: "status" },
           { label: "备注", field: "remark" },
           { label: "操作", field: "active" },