Merge remote-tracking branch 'origin/master' into 2.3.0

2017-07-16 16:10:08 +08:00
parent c47d5cc704 049b1b2bcc
commit 11d9cbd597
43 changed files with 281 additions and 83 deletions
--- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -38,7 +38,7 @@ public class ModelReturn {
  }

   /**
-   * property description  *_/ ' \" =end -- \\r\\n \\n \\r
+   * property description  *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
   * @return _return
  **/
  @ApiModelProperty(value = "property description  *_/ ' \" =end -- \\r\\n \\n \\r")