解决冲突

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

@@ -282,8 +282,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("零件名称集合")
     private String partNameList;
 
-    private Map<String, Object> extendMap;
-
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }