From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/update.json | 108 +++--------------------------------------------------
1 files changed, 7 insertions(+), 101 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/update.json b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/update.json
index c771e52..967a1a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/update.json
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/update.json
@@ -1,111 +1,17 @@
{
"data": {
- "systemId": "RLM",
+ "systemId": "MPM",
"user": {
"userName": "weidy",
"trueName": "榄忓ぇ鍕�",
"ip": "127.0.0.1"
},
- "classifys": {
- "classify": [
- {
- "classCode": "020104",
- "library": "StdLib",
- "fullclsfNamePath": "鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘爴",
- "objects": {
- "object": [
- {
- "code": "0201040002",
- "id": "0023401",
- "status": "Released",
- "operate": "update",
- "editor": "weidy",
- "prop": [
- {
- "key": "partNo",
- "text": "鐗屽彿",
- "value": "HB1-221"
- },
- {
- "key": "partName",
- "text": "鍚嶇О",
- "value": "鍗婂渾澶磋灪閽�1"
- },
- {
- "key": "PartNumber",
- "text": "",
- "value": "HB1-221-M4*6"
- },
- {
- "key": "鐗屽彿",
- "text": "",
- "value": "HB1-221"
- },
- {
- "key": "瑙勬牸",
- "text": "",
- "value": "M41"
- },
- {
- "key": "琛ㄩ潰澶勭悊",
- "text": "",
- "value": "鐢甸晙"
- },
- {
- "key": "淇濋櫓瀛斿瀷寮�",
- "text": "",
- "value": "鏃�1"
- }
- ]
- },
- {
- "code": "0201040003",
- "id": "0023402",
- "status": "Released",
- "operate": "update",
- "editor": "weidy",
- "prop": [
- {
- "key": "partNo",
- "text": "鐗屽彿",
- "value": "HB1-221"
- },
- {
- "key": "partName",
- "text": "鍚嶇О",
- "value": "鍗婂渾澶磋灪閽�2"
- },
- {
- "key": "PartNumber",
- "text": "",
- "value": "HB1-221-M4*5"
- },
- {
- "key": "鐗屽彿",
- "text": "",
- "value": "HB1-221"
- },
- {
- "key": "瑙勬牸",
- "text": "",
- "value": "M43"
- },
- {
- "key": "琛ㄩ潰澶勭悊",
- "text": "",
- "value": "鐢甸晙"
- },
- {
- "key": "淇濋櫓瀛斿瀷寮�",
- "text": "",
- "value": "鏃�2"
- }
- ]
- }
- ]
- }
- }
+ "library": {
+ "id": "wupin",
+ "classifyid":[
+ "020201",
+ "020202"
]
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3