Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java

@@ -2,8 +2,9 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.sql.Timestamp;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -52,7 +53,7 @@
    /**
     * 生产时间
     */
    private LocalDateTime damageTime;
    private Timestamp damageTime;

    /**
     * 备注