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

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProduceSnMcRecord.java

@@ -79,6 +79,11 @@ public class MesProduceSnMcRecord extends BaseBean implements Serializable {
     @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.MC_RECORD_QC_STATUS.class, refForeignKey = "value", value = "description")
     private Integer qcStatus;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer operateType;
+
     @Column(name = "LINE_ON_STATUS")
     @ApiParam("上线状态")
     @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.MC_RECORD_LINE_ON_STATUS.class, refForeignKey = "value", value = "description")