update meta codegen

This commit is contained in:
WILLIAM CHENG 2021-10-25 13:44:34 +08:00
parent 3594b3452d
commit c59a987e00
2 changed files with 1 additions and 9 deletions

View File

@ -121,11 +121,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<openapi-generator-version>6.0.0-SNAPSHOT</openapi-generator-version>
=======
<openapi-generator-version>5.3.1-SNAPSHOT</openapi-generator-version>
>>>>>>> origin/5.4.x
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version>
</properties>

View File

@ -1,5 +1 @@
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.1-SNAPSHOT
>>>>>>> origin/5.4.x
6.0.0-SNAPSHOT