Merge remote-tracking branch 'origin/dev_business' into dev_business

liu

2026-08-26 1f7c36424e8f48a5917ac6c77e2e47979c469a28

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java

@@ -43,4 +43,13 @@
    @ExcelProperty("备注")
    private String remark;

    @ExcelProperty("生产效率(每小时)")
    private java.math.BigDecimal productionEfficiency;

    @ExcelProperty("传送履带")
    private Integer conveyorBelt;

    @ExcelProperty("工作站编码")
    private String workstationCode;

}