Merge branch 'dm_20251204' into dev

# Conflicts: # mhd-user-center/src/main/resources/mapper/UserMapper.xml # mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
2025-12-06 22:15:26 +08:00
parent 8527d24d48 5b2212d5db
commit 2a1e542704
63 changed files with 314 additions and 257 deletions
@@ -33,12 +33,12 @@
    i.material_id,
    m.category AS material_category,
    m.name AS material_name,
-    m.model AS material_model,
+    m."MODEL" AS material_model,
    i.quantity,
    m.unit,
    m.weight,
    m.code_managed,
-    m.value,
+    m."VALUE",
    i.machine_serial_no,
    i.created_at
    FROM
@@ -91,7 +91,7 @@
           i.material_id,
           m.category AS material_category,
           m.name     AS material_name,
-           m.model    AS material_model,
+           m."MODEL"    AS material_model,
           i.quantity,
           m.unit,
           m.weight,