From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/common/xml/Version.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/common/xml/Version.java b/src/main/java/com/moral/common/xml/Version.java
index 61b2280..78ad039 100644
--- a/src/main/java/com/moral/common/xml/Version.java
+++ b/src/main/java/com/moral/common/xml/Version.java
@@ -16,7 +16,7 @@
return Ver;
}
- @XmlElement
+ @XmlElement(name = "Ver")
public void setVer(String ver) {
Ver = ver;
}
@@ -25,7 +25,7 @@
return FileName;
}
- @XmlElement
+ @XmlElement(name = "FileName")
public void setFileName(String fileName) {
FileName = fileName;
}
@@ -34,7 +34,7 @@
return FileMD5Hash;
}
- @XmlElement
+ @XmlElement(name = "FileMD5Hash")
public void setFileMD5Hash(String fileMD5Hash) {
FileMD5Hash = fileMD5Hash;
}
--
Gitblit v1.8.0