Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java

@@ -1,6 +1,7 @@
package com.mes.engineering.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -97,5 +98,14 @@
     */
    private String notes;

    /**
     * 上片机线路
     */
    private Integer stationCell;

    /**
     * 除膜方式
     */
    @TableField(exist = false)
    private Integer filmRemove;
}