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

2026-02-14 03:35:12 +00:00 · 2025-12-22 11:09:17 +08:00
parent acef0b8ca2 d2a30fe33b
commit 48b51c3a4a
28 changed files with 19433 additions and 622 deletions
--- a/unilabos/resources/itemized_carrier.py
+++ b/unilabos/resources/itemized_carrier.py
@@ -29,7 +29,7 @@ class Bottle(Well):
        size_x: float = 0.0,
        size_y: float = 0.0,
        size_z: float = 0.0,
-        barcode: Optional[str] = "",
+        barcode: Optional[str] = None,
        category: str = "container",
        model: Optional[str] = None,
        **kwargs,