Merge branch 'master' into master

xdx54321 · web-flow · commit 592bf0d2c294 · 2020-05-20T17:28:33.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ target/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /target/
+pom.xml.releaseBackup
+release.properties
