解决冲突

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel;
+import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesWorkOrderButtonModel workOrderButtonModel;
+    private MesButtonFlagModel workOrderButtonModel;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产工单页面按钮控制model")
-public class MesWorkOrderButtonModel implements Serializable {
+@Api("pcn页面按钮控制model")
+public class MesButtonFlagModel implements Serializable {
 
     @ApiParam("修改按钮")
     private boolean updateButton;