Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 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;
@@ -105,5 +106,6 @@
    /**
     * 除膜方式
     */
    @TableField(exist = false)
    private Integer filmRemove;
}