From 926d1a1a4f06271cb39de001d74c68832fc004c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 三月 2024 17:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js b/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
index 4b91c2d..4558584 100644
--- a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
+++ b/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
@@ -247,10 +247,10 @@
"lctid": null,
"name": "璇勫浠诲姟鍒楄〃",
"nameOid": null,
- "oid": "2D6D571B-BB6E-677D-9764-191BC5D5D3F1",
+ "oid": "2D6D571B-BB6E-677D-9764-191BC5D5D3F11",
"orderNum": 1,
"owner": null,
- "pkLayout": "2692E26B-8584-4561-8A03-D5921A82E490",
+ "pkLayout": "2692E26B-8584-4561-8A03-D5921A82E4901",
"revisionOid": null,
"revisionRule": null,
"revisionSeq": 0,
@@ -473,7 +473,7 @@
"id": "auditTaskTable",
"limits": null,
"linkTypeFlag": false,
- "oid": "0A8030A1-2E3F-5D7D-A599-961A3829E6C5",
+ "oid": "0A8030A1-2E3F-5D7D-A599-961A3829E6C51",
"pageVO": null,
"queryColumns": [
{
@@ -1061,10 +1061,10 @@
"lctid": null,
"name": "璇勫浠诲姟鍒楄〃",
"nameOid": null,
- "oid": "2692E26B-8584-4561-8A03-D5921A82E490",
+ "oid": "2692E26B-8584-4561-8A03-D5921A82E4901",
"orderNum": 1,
"owner": null,
- "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB",
+ "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
"revisionOid": null,
"revisionRule": null,
"revisionSeq": 0,
@@ -1392,10 +1392,10 @@
"lctid": null,
"name": "鍒嗙被鏍�",
"nameOid": null,
- "oid": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
+ "oid": "7170DFF8-C1DE-04A8-46F0-BC4379980BC71",
"orderNum": 1,
"owner": null,
- "pkLayout": "7DDAED74-95BC-FDCE-53F4-A5E72815D5E6",
+ "pkLayout": "7DDAED74-95BC-FDCE-53F4-A5E72815D5E61",
"revisionOid": null,
"revisionRule": null,
"revisionSeq": 0,
@@ -1448,10 +1448,10 @@
"lctid": null,
"name": "宸ヨ壓璇勫鍒楄〃",
"nameOid": null,
- "oid": "E28B0555-FAF3-4F59-0EE8-64A30A77C9CB",
+ "oid": "E28B0555-FAF3-4F59-0EE8-64A30A77C9CB1",
"orderNum": 1,
"owner": null,
- "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB",
+ "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
"revisionOid": null,
"revisionRule": null,
"revisionSeq": 0,
--
Gitblit v1.9.3