Merge remote-tracking branch 'origin/master'

wu

2024-05-10 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75

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

@@ -5,8 +5,7 @@
import org.springframework.data.annotation.Id;
import org.springframework.stereotype.Component;

import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;

import java.io.Serializable;

/**
@@ -27,8 +26,7 @@
    /**
     * 下片玻璃信息表id
     */
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)

    private Long id;

    /**