Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-12 a5771725ac324c3dae366e6fcc38055b39ea4386

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java

@@ -62,14 +62,14 @@
     */
    private Integer state;

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

    /**
     * 设备
     */
    private Integer stationCell;
//    /**
//     * 除膜方式
//     */
//    private Integer filmRemove;
//
//    /**
//     * 设备
//     */
//    private Integer stationCell;

}