Merge dptech/workstation_dev_YB4: resolve conflicts by keeping local changes (ours)

This commit is contained in:
dijkstra402
2025-12-22 11:09:17 +08:00
28 changed files with 19433 additions and 622 deletions

View File

@@ -24,9 +24,9 @@
"Drip_back": "3a162cf9-6aac-565a-ddd7-682ba1796a4a"
},
"material_type_mappings": {
"烧杯": "BIOYOND_PolymerStation_1FlaskCarrier",
"试剂瓶": "BIOYOND_PolymerStation_1BottleCarrier",
"样品板": "BIOYOND_PolymerStation_6VialCarrier"
"烧杯": "YB_1FlaskCarrier",
"试剂瓶": "YB_1BottleCarrier",
"样品板": "YB_6VialCarrier"
}
},
"deck": {