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

This commit is contained in:
William Cheng
2018-10-26 21:04:25 +08:00
757 changed files with 23913 additions and 2474 deletions

View File

@@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **Long** | | [optional]
**name** | **String** | | [optional]
**name** | **String** | |

View File

@@ -30,7 +30,7 @@ public class Category {
private Long id;
@JsonProperty("name")
private String name;
private String name = "default-name";
public Category id(Long id) {
this.id = id;
@@ -59,7 +59,7 @@ public class Category {
* Get name
* @return name
**/
@ApiModelProperty(value = "")
@ApiModelProperty(required = true, value = "")
public String getName() {
return name;
}