diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
index 2cdb4ef..6b94791 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
@@ -67,6 +67,11 @@ public class BaseShiftInfo extends TenantEntity {
      */
     private String activeFlag;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    private String classType;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
index 49f9a1b..d3b9f02 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
@@ -122,6 +122,11 @@ public class ProdBaseMachineInfo extends TenantEntity {
      */
     private Long requestInterval;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    private String classType;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */
@@ -144,4 +149,5 @@ public class ProdBaseMachineInfo extends TenantEntity {
      */
     @TableField(exist = false)
     private String deviceModeName;
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
index 444b1be..e4caa92 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
@@ -74,5 +74,9 @@ public class BaseShiftInfoBo extends BaseEntity {
 /*    @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String activeFlag;
 
-
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @NotBlank(message = "班制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String classType;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
index bc7c754..ab7d7c4 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
@@ -145,5 +145,11 @@ public class ProdBaseMachineInfoBo extends BaseEntity {
      */
     private String instockType;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @NotBlank(message = "班制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String classType;
+
     private List<ProdBaseMachineProcess> baseMachineProcessList;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
index cbd0953..9469adc 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
@@ -122,5 +122,10 @@ public class BaseShiftInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
-
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @ExcelProperty(value = "班制类型(2两班 3三班)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_class_type")
+    private String classType;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
index bdbaae8..4283aec 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
@@ -197,6 +197,13 @@ public class ProdBaseMachineInfoVo implements Serializable {
     @ExcelProperty(value = "设备模型名称")
     private String deviceModeName;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @ExcelProperty(value = "班制类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_class_type")
+    private String classType;
+
     /**
      * 入库类型（1直接入库 2扫描入库）
      */