[java][resttemplate] Fix model combining properties and additional properties (#19706)

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Category.java

@@ -97,6 +97,7 @@ public class Category {
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -129,6 +129,7 @@ public class ModelApiResponse {
     this.message = message;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Order.java

@@ -259,6 +259,7 @@ public class Order {
     this.complete = complete;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Pet.java

@@ -281,6 +281,7 @@ public class Pet {
     this.status = status;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Tag.java

@@ -97,6 +97,7 @@ public class Tag {
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/User.java

@@ -283,6 +283,7 @@ public class User {
     this.userStatus = userStatus;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {