Merge remote-tracking branch 'origin/master'

wu

2024-08-06 4c42d82f177b24f21dee14dd041035fb6c1ce7ee

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java

@@ -1,12 +1,11 @@
package com.mes.downglassinfo.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Id;
import org.springframework.stereotype.Component;

import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import java.io.Serializable;

/**
@@ -27,14 +26,28 @@
    /**
     * 下片玻璃信息表id
     */
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 工位id
     */
    private Integer workStationId;

    /**
     * 工程id
     */
    private String engineerId;

    /**
     * 流程卡号
     */
    private String flowCardId;

    /**
     * 层号
     */
    private Integer layer;

    /**
     * 顺序
@@ -44,17 +57,17 @@
    /**
     * 宽
     */
    private Double width;
    private double width;

    /**
     * 高
     */
    private Double height;
    private double height;

    /**
     * 厚度
     */
    private Double thickness;
    private double thickness;

    /**
     * 膜系