From cb966ac5c02835eab5a99b7b93a5a9a063cf3201 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 六月 2025 15:55:08 +0800
Subject: [PATCH] 人员优化
---
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
index 07cea32..1b4c928 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
@@ -25,21 +26,28 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ *
+ * 鐢熶骇鍔犲伐id
+ */
+ @TableField(value = "master_id")
+ private Long masterId;
/**
* 渚涜揣鍟嗗悕绉�
*/
@TableField(value = "supplier_name")
private String supplierName;
/**
+ * 渚涜揣鍟嗗悕绉�
+ */
+ @TableField(value = "supplier_id")
+ private Long supplierId;
+ /**
* 鐓ょ
*/
@TableField(value = "coal_id")
private Long coalId;
- /**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
/**
* 鍗曚綅
*/
@@ -74,10 +82,11 @@
* 鐧昏浜�
*/
@TableField(value = "registrant_id")
- private String registrantId;
+ private Long registrantId;
/**
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
}
\ No newline at end of file
--
Gitblit v1.9.3