【代码合并还原】

5 years ago · 543f0f5c4c
parent b450df5754
commit 543f0f5c4c
1 changed files with 2 additions and 7 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
@ -26,10 +26,10 @@ public class MesWorkOrderModel {
    @AnnoOutputColumn
    private String partNo;

-    //客户产线代码
+    //产线代码
    @ApiParam("ProductionLineID")
    @AnnoOutputColumn
-    private String custProdLineCode;
+    private String workCenterCode;

    //数量
    @ApiParam("DemandQty")
@ -41,9 +41,4 @@ public class MesWorkOrderModel {
    @AnnoOutputColumn
    private String startTime;

-    //开始时间
-    @ApiParam("WORK_CENTER_CODE")
-    @AnnoOutputColumn
-    private String workCenterCode;
-
 }