From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
index 70b118d..5a4bf15 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
@@ -1,29 +1,29 @@
package com.vci.ubcs.code.dto.datapush.result;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-@XStreamAlias("object")
+//@XStreamAlias("object")
public class ResultNodeObjectDTO {
/***
* 鏁版嵁缂栫爜
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String code;
/***
* 鏁版嵁oid
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String oid;
/***
* 閿欒鏍囪瘑
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String erroid;
/***
* 閿欒淇℃伅
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String msg;
public String getCode() {
--
Gitblit v1.9.3