Explorar o código

Merge branch 'fix/defaultWoText' into 'develop'

默认text

See merge request o2oa/o2oa!1856

(cherry picked from commit 79fc3105662dd08abed16c21eafb06c4eda88bc3)

c436e6b3 默认text
o2null %!s(int64=5) %!d(string=hai) anos
pai
achega
8f06eeb648

+ 1 - 1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoText.java

@@ -22,7 +22,7 @@ public class WoText extends GsonPropertyObject {
 	private String contentType;
 	private String contentType;
 
 
 	public String getContentType() {
 	public String getContentType() {
-		return StringUtils.isEmpty(this.contentType) ? HttpMediaType.APPLICATION_JSON_UTF_8 : this.contentType;
+		return StringUtils.isEmpty(this.contentType) ? HttpMediaType.TEXT_PLAIN_UTF_8 : this.contentType;
 	}
 	}
 
 
 	public void setContentType(String contentType) {
 	public void setContentType(String contentType) {