From 584dbcd691e66b6deb4d4821ab6eea10bf8c35dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 18 七月 2025 11:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 db/430设备管理数据库设计.pdma.json |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 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..6975805 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"
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.9.2",
   "createdTime": "2025-3-10 16:38:19",
-  "updatedTime": "2025-7-17 19:49:48",
+  "updatedTime": "2025-7-18 10:15:01",
   "dbConns": [],
   "profile": {
     "default": {
@@ -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",
@@ -30272,24 +30278,6 @@
           "extProps": {},
           "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
           "id": "589C45F0-0F8C-4497-8999-A8314DE5D601"
-        },
-        {
-          "defKey": "order_id",
-          "defName": "鎶�鏈姸鎬侀壌瀹氬伐鍗旾D",
-          "comment": "鎼縼浣跨敤",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
-          "id": "153169DD-C196-48EC-B0B4-60626C830D64"
         }
       ],
       "correlations": [],

--
Gitblit v1.9.3