From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期四, 09 五月 2024 07:26:56 +0800 Subject: [PATCH] 实现报告生成合并单元格;修复部分bug --- inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java index 426cb92..15f5597 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java @@ -1,13 +1,11 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; /** * 璐ф灦 @@ -30,11 +28,13 @@ /** * 琛� */ + @TableField("`row`") private Integer row; /** * 鍒� */ + @TableField("`col`") private Integer col; /** -- Gitblit v1.9.3