Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-12 a5771725ac324c3dae366e6fcc38055b39ea4386

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

@@ -96,10 +96,14 @@
     * 备注
     */
    private String notes;

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


    /**
     * 除膜方式
     */
    private Integer filmRemove;
}