From 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 17 七月 2025 20:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/430设备管理数据库设计.pdma.json | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 31 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 621ea76..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"
@@ -2,9 +2,9 @@
"name": "430璁惧绠＄悊鏁版嵁搴撹璁�",
"describe": "鎻忚堪璁惧绠＄悊鏁版嵁搴撹璁℃枃妗�",
"avatar": "",
- "version": "4.9.4",
+ "version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-7-17 16:59:40",
+ "updatedTime": "2025-7-17 19:49:48",
"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",
@@ -31111,7 +31117,7 @@
"scale": "",
"primaryKey": false,
"notNull": false,
- "autoIncrement": true,
+ "autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
@@ -31334,7 +31340,25 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
- "defKey": "depart_header_signature_comment",
+ "defKey": "depart_header_signature_result",
+ "defName": "浣跨敤鍗曚綅瀹や富绠＄瀛楃粨鏋�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "491BB748-36C9-4CD5-8FA5-5C7AA60327B2"
+ },
+ {
+ "defKey": "depart_header_comment",
"defName": "浣跨敤鍗曚綅瀹や富绠℃剰瑙�",
"comment": "",
"type": "",
@@ -31418,8 +31442,26 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
- "defKey": "depart_leader_signature_comment",
- "defName": "浣跨敤鍗曚綅閮ㄤ富绠＄瀛�",
+ "defKey": "depart_leader_signature_result",
+ "defName": "浣跨敤鍗曚綅閮ㄤ富绠＄瀛楃粨鏋�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "577D41D0-1925-4629-A179-E3F0BB23E3F7"
+ },
+ {
+ "defKey": "depart_leader_comment",
+ "defName": "浣跨敤鍗曚綅閮ㄤ富绠℃剰瑙�",
"comment": "",
"type": "",
"len": "",
@@ -31472,6 +31514,24 @@
"attr9": "",
"id": "403E2E22-E3B6-4385-8438-50D2548E2766",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "remark",
+ "defName": "澶囨敞",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "26D9A490-CD27-4C33-893B-962EA8DFCF2F"
}
],
"correlations": [],
@@ -31719,6 +31779,24 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
+ "defKey": "application_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": "BF662050-3C75-4F7A-8784-6C0E0DBEC5DD"
+ },
+ {
"defKey": "equipment_id",
"defName": "璁惧ID",
"comment": "",
@@ -31756,26 +31834,8 @@
},
{
"defKey": "deactivate_duration",
- "defName": "鍋滅敤鏃堕暱",
+ "defName": "宸插仠鐢ㄦ椂闀�",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
- "extProps": {},
- "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
- "id": "2E37AD51-B4B4-4122-99D5-8552F099EF2A"
- },
- {
- "defKey": "deactivate_duration_unit",
- "defName": "鍋滅敤鏃堕暱鍗曚綅",
- "comment": "澶┿�佹湀銆佸勾",
"type": "",
"len": "",
"scale": "",
@@ -31787,8 +31847,8 @@
"refDict": "",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
"extProps": {},
- "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
- "id": "583D0E63-78AF-46F4-BD7A-4224161872CF"
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "2E37AD51-B4B4-4122-99D5-8552F099EF2A"
}
],
"correlations": [],
@@ -33156,4 +33216,4 @@
"enable": true
}
]
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3