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

liyong

4 天以前 f90d9f53beb844265c4153159aadb0baf81bafdb

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

@@ -35,4 +35,7 @@
    @Schema(description = "设备状态", example = "1")
    private Integer status;

    @Schema(description = "工作站编号", example = "300")
    private Long workstationId;

}