Merge branch 'test' into ext-dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2070,6 +2070,7 @@ public class MesEnumUtil {
         MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"),
         MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"),
         MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"),
+        MES_PART_EXT_OJBECT(341, "PartObjectExtExcelService", "物料对象Ext"),
         MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"),
         MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"),

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -170,6 +170,9 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("补偿过程条码")
     private String compensateSn;
 
+    @Column(name = "OVERTIME_REASON")
+    @ApiParam("超时原因备注")
+    private String overtimeReason;
 
     @Transient
     @ApiParam("返回信息")