From 88055f5966507100a3b3d334ca1eb3cabc02ba14 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 20:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 db/430设备管理数据库设计.pdma.json |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index 99ba1a7..5e5694b 100644
--- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -13631,7 +13631,9 @@
           "attr8": "",
           "attr9": "",
           "id": "1CC43FB0-98B8-4000-91A3-E077BD7EA4E8",
-          "baseType": ""
+          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": ""
         }
       ],
       "correlations": [],
@@ -13992,7 +13994,9 @@
           "attr8": "",
           "attr9": "",
           "id": "5B168FA5-7457-48C0-BD48-0D892AE5EBAF",
-          "baseType": ""
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "type": ""
         },
         {
           "defKey": "training_user_time",
@@ -14018,7 +14022,9 @@
           "attr8": "",
           "attr9": "",
           "id": "6AE68254-FA3D-4CBE-94B4-1A13BDC7DE19",
-          "baseType": ""
+          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": ""
         },
         {
           "defKey": "report_id",
@@ -33210,4 +33216,4 @@
       "enable": true
     }
   ]
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3