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

chenrui

2025-03-24 85766196b2b6588e8dec502366b3c5619133004c

 .gitignore

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

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