修改因合并版本造成代码丢失的问题

houruijun

2020-10-22 e50e03e296a2456836afbb7f6bee461ee7bddd05

 .gitignore

@@ -1,6 +1,3 @@
.idea/compiler.xml
.idea/compiler.xml
.idea/workspace.xml
HELP.md
/target/
!.mvn/wrapper/maven-wrapper.jar
@@ -29,4 +26,7 @@
/build/
 
### VS Code ###
.vscode/
.vscode/
/kidgrow-web/kidgrow-web-manager/src/main/resources/static/package-lock.json
/kidgrow-web/kidgrow-web-manager/src/main/resources/static.zip
/git