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

@@ -276,7 +276,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.27</jersey-version>
<jackson-version>2.10.3</jackson-version>
<jackson-databind-version>2.10.3</jackson-databind-version>

View File

@@ -42,7 +42,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";