Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -31,6 +31,11 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -68,10 +73,6 @@ public class MesCellFeed extends BaseBean implements Serializable {
     private String supplierCode;
 
     @Transient
-    @ApiParam("工单号")
-    private String orderNo;
-
-    @Transient
     @ApiParam(value = "原料类型名称")
     private String rawTypeName;