Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-10 503c2e1cba7975481af960d5fdfa840be647dc46

 zq-erp/.gitignore

@@ -25,6 +25,7 @@
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
*/resources/generated-sources/*
# Gradle:
.idea/gradle.xml
.idea/