Merge branch 'refs/heads/develop' into feature/tool_standard_library_process

# Conflicts: # sf_manufacturing/models/product_template.py
2025-03-26 17:01:13 +08:00
parent 11a5217430 855e0eb1c2
commit d2155b17b4
20 changed files with 256 additions and 114 deletions
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -645,6 +645,7 @@
                <field name="long"/>
                <field name="width"/>
                <field name="height"/>
+                <field name="remark"/>
            </tree>
        </field>
    </record>