From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java |  141 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 141 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
new file mode 100644
index 0000000..9a01df7
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/purchase/AccountPaymentApplication.java
@@ -0,0 +1,141 @@
+package com.ruoyi.account.pojo.purchase;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+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.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@Getter
+@Setter
+@ToString
+@TableName("account_payment_application")
+@ApiModel(value = "AccountPaymentApplication瀵硅薄", description = "璐㈠姟绠＄悊--浠樻鐢宠")
+public class AccountPaymentApplication implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    @ApiModelProperty("鍒涘缓浜�")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    /**
+     * 淇敼浜�
+     */
+    @ApiModelProperty("淇敼浜�")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty("淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime updateTime;
+
+    /**
+     * 閮ㄩ棬ID
+     */
+    @ApiModelProperty("閮ㄩ棬ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
+
+    /**
+     * 渚涘簲鍟唅d
+     */
+    @ApiModelProperty("渚涘簲鍟唅d")
+    private Integer supplierId;
+
+    /**
+     * 鍏宠仈鍏ュ簱鍗昳d(澶氶��)
+     */
+    @ApiModelProperty("鍏宠仈鍏ュ簱鍗昳d(澶氶��)")
+    private String stockInRecordIds;
+
+    /**
+     * 浠樻鐢宠鍗曞彿
+     */
+    @ApiModelProperty("浠樻鐢宠鍗曞彿")
+    @Excel(name = "浠樻鐢宠鍗曞彿")
+    private String invoiceApplicationNo;
+
+    /**
+     * 浠樻鏂瑰紡
+     */
+    @ApiModelProperty("浠樻鏂瑰紡")
+    @Excel(name = "浠樻鏂瑰紡")
+    private String paymentMethod;
+
+    /**
+     * 浠樻浜嬬敱
+     */
+    @ApiModelProperty("浠樻浜嬬敱")
+    @Excel(name = "浠樻浜嬬敱")
+    private String paymentContent;
+
+    /**
+     * 鐢宠鏃ユ湡
+     */
+    @ApiModelProperty("鐢宠鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鐢宠鏃ユ湡")
+    private LocalDate applyDate;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty("澶囨敞")
+    @Excel(name = "澶囨敞")
+    private String remark;
+
+    /**
+     * 瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃
+     */
+    @ApiModelProperty("瀹℃牳鐘舵��:0寰呭鏍�1瀹℃牳閫氳繃2瀹℃牳涓嶉�氳繃")
+    @Excel(name = "瀹℃牳鐘舵��",readConverterExp = "0=寰呭鏍�,1=瀹℃牳閫氳繃,2=瀹℃牳涓嶉�氳繃")
+    private Integer status;
+
+    /**
+     * 浠樻閲戦
+     */
+    @ApiModelProperty("浠樻閲戦")
+    @Excel(name = "浠樻閲戦")
+    private BigDecimal paymentAmount;
+}

--
Gitblit v1.9.3