Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-08-20 74173fd310569a79104bfe1beb97e73890c4cda9

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.mes.base.entity.BigStorageCageBaseInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -92,7 +91,4 @@
     */
    @ApiModelProperty(value = "工程id", position = 17)
    private String engineerId;

    @TableLogic
    private int deleted;
}