Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-07 6beb066cae877ac1ec9b3627fc83bab9a018d3cd

 zq-erp/.gitignore

@@ -25,6 +25,7 @@
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
*/resources/generated-sources/*
# Gradle:
.idea/gradle.xml
.idea/
@@ -75,4 +76,5 @@
.project
.classpath
.settings
.metadata
.metadata
.gitignore