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

This commit is contained in:
William Cheng
2019-06-03 00:06:43 +08:00
1959 changed files with 24161 additions and 4878 deletions

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/

View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
>>>>>>> origin/master
* https://openapi-generator.tech
* Do not edit the class manually.
*/