Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-04-17 5d70dcef9c9b4f7eb1cd092dcc4f4b8b802c5d30

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java

@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -94,7 +94,7 @@
     */
    private Integer creater;

    private LocalDateTime createTime;
    private Date createTime;

    @TableField("intRemark")
    private Integer intremark;