From d8c86797adaef6c416efae16586f350ae77bde4b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 12 九月 2026 12:43:08 +0800
Subject: [PATCH] feat: 库存入库/出库字段全链路、采购台账申请提交时间、储罐租客信息、油库储罐模块
---
src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
index 17a691c..8c37b72 100644
--- a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
+++ b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +16,7 @@
*/
@TableName(value = "payment_shipping")
@Data
-@ApiModel
+@Schema
public class PaymentShipping {
@@ -28,56 +27,58 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁㈠崟鍙�")
+ @Schema(description = "璁㈠崟鍙�")
private String orderNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customer;
- @ApiModelProperty(value = "璁㈠崟閲戦")
+ @Schema(description = "璁㈠崟閲戦")
private String orderAmount;
- @ApiModelProperty(value = "宸蹭粯娆鹃噾棰�")
+ @Schema(description = "宸蹭粯娆鹃噾棰�")
private String paidAmount;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "浠樻鐘舵��")
+ @Schema(description = "浠樻鐘舵��")
private String paymentStatus;
- @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ @Schema(description = "鍙戣揣鐘舵��")
private String shippingStatus;
- @ApiModelProperty(value = "鍙戣揣鏃ユ湡")
+ @Schema(description = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shippingDate;
- @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @Schema(description = "鐗╂祦鍗曞彿")
private String trackingNo;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3