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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -142,7 +142,10 @@ public class StationRequestBean implements Serializable {
     private Integer isOnTimeComplete;
 
     @ApiParam("工位剩余时间")
-    private Integer remainWorkTime;
+    private Long remainWorkTime;
+
+    @ApiParam("是否操作超时")
+    private Integer isTimeOut;
 
     @ApiParam("特殊展示数据")
     private Map<String, Object> specialDisplayMap  = new HashMap<>();