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

chenrui

2025-03-24 c8355d4a1f27716edc510d936b6a7982b0ab99b3

 .gitignore

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

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