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

zss

2024-08-20 5c23611de83b28d34ea486af67e1f4ce5c8a494b

 .gitignore

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

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