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

This commit is contained in:
William Cheng
2019-10-04 15:02:58 +08:00
1246 changed files with 29609 additions and 16734 deletions

View File

@@ -58,6 +58,9 @@ public class FormatTest {
@JsonProperty("password")
private String password;
@JsonProperty("BigDecimal")
private BigDecimal bigDecimal;
public FormatTest integer(Integer integer) {
this.integer = integer;
return this;
@@ -337,6 +340,27 @@ public class FormatTest {
this.password = password;
}
public FormatTest bigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
return this;
}
/**
* Get bigDecimal
* @return bigDecimal
*/
@ApiModelProperty(value = "")
@Valid
public BigDecimal getBigDecimal() {
return bigDecimal;
}
public void setBigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
}
@Override
public boolean equals(java.lang.Object o) {
@@ -359,12 +383,13 @@ public class FormatTest {
Objects.equals(this.date, formatTest.date) &&
Objects.equals(this.dateTime, formatTest.dateTime) &&
Objects.equals(this.uuid, formatTest.uuid) &&
Objects.equals(this.password, formatTest.password);
Objects.equals(this.password, formatTest.password) &&
Objects.equals(this.bigDecimal, formatTest.bigDecimal);
}
@Override
public int hashCode() {
return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password);
return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
}
@Override
@@ -385,6 +410,7 @@ public class FormatTest {
sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n");
sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n");
sb.append(" password: ").append(toIndentedString(password)).append("\n");
sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
sb.append("}");
return sb.toString();
}