Merge remote-tracking branch 'origin/master'

.gitignore

@@ -23,6 +23,7 @@ mvnw.cmd
 *.ipr
 /toolset/codegen/src/main/resources/generateConfigration.xml
 **/bootstrap-dev.yml
+**/bootstrap-dev.properties
 
 
 ### 忽略子模块的文件 ###
@@ -55,5 +56,3 @@ target
 **/bootstrap-local.yml
 **/bootstrap-local.properties
 **/logback-spring.xml
-/.gitignore
-/.gitignore