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

chenlu

2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f

 .gitignore

@@ -13,3 +13,5 @@

# Ignore .idea files
**/.idea/
../idea/*
**/target/