From 7405307e8fd816263592d19c99d20f8b1b601160 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 18 八月 2025 18:14:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 db/双林新火炬MES数据库设计.pdma.json |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index 6b165cf..9295952 100644
--- "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\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-8-16 15:26:48",
+  "updatedTime": "2025-8-18 15:02:20",
   "dbConns": [],
   "profile": {
     "default": {
@@ -11555,6 +11555,24 @@
           "id": "125E1F1A-A084-4244-8D44-57D5838EE133"
         },
         {
+          "defKey": "finished_pallets",
+          "defName": "宸茬敓浜ф墭鏁�",
+          "comment": "褰撳墠鐝宸茬敓浜х殑鎵樻暟閲忥紝姣忔鎶ュ伐鏇存柊",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "A2AFA492-7799-4E1C-B2AB-A6004630C951"
+        },
+        {
           "defKey": "publisher",
           "defName": "鍙戝竷浜�",
           "comment": "",

--
Gitblit v1.9.3