解决冲突

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

@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesButtonFlagModel workOrderButtonModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesButtonFlagModel workOrderButtonModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
     @Transient
     @ApiParam(value = "下达按钮编号")

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

@@ -71,7 +71,7 @@ public class MesEquTaskModel implements Serializable {
     private String notifyFlagName;
 
     @ApiParam("mes设备作业任务页面按钮控制")
-    private MesButtonFlagModel equTaskButtonFlagModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
 
     public MesEquTaskModel() {