解决冲突

5 years ago · 7457e27180
parent 12478a6251
commit 7457e27180
1 changed files with 0 additions and 2 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/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;
    }