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

晏有为

2024-05-16 6b1886314fd18f34740c96bb4fd86046600dd2c0

 .gitignore

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

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