Merge remote-tracking branch 'origin/master' into 5.0.x

This commit is contained in:
William Cheng
2020-04-28 20:35:28 +08:00
659 changed files with 34446 additions and 1182 deletions

View File

@@ -287,7 +287,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<swagger-annotations-version>1.6.1</swagger-annotations-version>
<jersey-version>2.6</jersey-version>
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.6</commons_lang3_version>

View File

@@ -41,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
public class Animal {
public static final String JSON_PROPERTY_CLASS_NAME = "className";
private String className;
protected String className;
public static final String JSON_PROPERTY_COLOR = "color";
private String color = "red";