Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

Calvin

2024-07-31 f086664481f69eda8a5dd30747b3ed7cb496b9ba

 .gitignore

@@ -19,7 +19,7 @@
*.iml
*.ipr
*.log
*.jar
#*.jar

### NetBeans ###
/nbproject/private/