Просмотр исходного кода

Merge branch 'cherry-pick-79fc3105' into 'wrdp'

Merge branch 'fix/defaultWoText' into 'develop'

See merge request o2oa/o2oa!1859
胡起 5 лет назад
Родитель
Сommit
5b7dc26bac

+ 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;
 
 	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) {