From f0f19fae3c310667b6732a3ac96df8e5d618fcff Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 15:15:37 +0800
Subject: [PATCH] 1.生产报工的成品未进入到入库记录中 2.仓储物流-入库来源保留合格自定义入库、生产报工-入库。出库来源只保留合格自定义出库
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
index edf603a..9742071 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
@@ -5,6 +5,8 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
/**
@@ -24,30 +26,35 @@
* 浼氳瀹ゅ悕绉�
*/
@TableField(value = "name")
+ @Excel(name = "浼氳瀹ゅ悕绉�")
private String name;
/**
* 浣嶇疆
*/
@TableField(value = "location")
+ @Excel(name = "浣嶇疆")
private String location;
/**
* 瀹圭撼浜烘暟
*/
@TableField(value = "capacity")
+ @Excel(name = "瀹圭撼浜烘暟")
private Integer capacity;
/**
* 璁惧閰嶇疆锛堥�楀彿鍒嗛殧锛�
*/
@TableField(value = "equipment")
+ @Excel(name = "璁惧閰嶇疆")
private String equipment;
/**
* 鐘舵�侊紙1:鍚敤 0:绂佺敤锛�
*/
@TableField(value = "status")
+ @Excel(name = "鐘舵��", readConverterExp = "1=鍚敤,0=绂佺敤")
private Integer status;
/**
--
Gitblit v1.9.3