Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-09-06 d809ecd16cbb23f5aad86a6844f51ffea0455fe8

 .gitignore

@@ -14,3 +14,4 @@
# Ignore .idea files
**/.idea/
../idea/*
**/target/