From c8ab2314ef277fce192b79efe13dfc922be80140 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 03 三月 2026 16:52:11 +0800
Subject: [PATCH] fix: 工序的工资定额可以保存为null值
---
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
new file mode 100644
index 0000000..d29666d
--- /dev/null
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
@@ -0,0 +1,91 @@
+package com.ruoyi.aftersalesservice.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <br>
+ * 涓存湡鍞悗绠＄悊瀹炰綋绫�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/02 14:41
+ */
+@Data
+@TableName("after_sales_near_expiry")
+@ApiModel("涓存湡鍞悗绠＄悊琛�")
+public class AfterSalesNearExpiry {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty("涓婚敭")
+ private Long id;
+
+ @ApiModelProperty("涓存湡浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty("浜у搧鎵瑰彿")
+ private String batchNumber;
+
+ @ApiModelProperty("涓存湡鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expireDate;
+
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ private Integer stockQuantity;
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ private String contactPhone;
+
+ @ApiModelProperty("闂鎻忚堪")
+ private String disRes;
+
+ @ApiModelProperty("澶勭悊缁撴灉")
+ private String disposeResult;
+
+ @ApiModelProperty("澶勭悊鐘舵�� (1-寰呭鐞� 2-宸插鐞�)")
+ private Integer status;
+
+ @ApiModelProperty("澶勭悊浜篒D")
+ private Long disposeUserId;
+
+ @ApiModelProperty("澶勭悊浜哄悕绉�")
+ private String disposeNickName;
+
+ @ApiModelProperty("澶勭悊鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate disDate;
+
+ @ApiModelProperty("鍒涘缓鑰�")
+ private Long createUser;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("淇敼鑰�")
+ private Long updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("绉熸埛id")
+ private Long tenantId;
+}
\ No newline at end of file
--
Gitblit v1.9.3