From c631edf462f4ab19403f5194dec743168e2a0e79 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 07 九月 2026 14:22:10 +0800
Subject: [PATCH] feat:合并开票

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
index 852792a..a5dea23 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
@@ -22,7 +22,7 @@
 public class ContractInvoice extends BaseModel<ContractInvoice> {
 
 	@Schema(description = "鍏宠仈鍚堝悓ID")
-	@Column(columnDefinition = "bigint not null comment '鍏宠仈鍚堝悓ID'")
+	@Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
 	private Long contractId;
 
 	@Schema(description = "鍙戠エ绫诲瀷")
@@ -114,6 +114,10 @@
 	@Column(columnDefinition="text comment '鍙戠エ棰勮bip鎺ㄩ�佹垚鍔熷悗杩斿洖鐨勬暟鎹粨鏋�'")
 	private String bipBody;
 
+	@Schema(description = "bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID")
+	@Column(columnDefinition="varchar(64) comment 'bip鎺ㄩ�佹垚鍔熷悗杩斿洖鏁版嵁ID'")
+	private String bipFileId;
+
 	@Schema(description = "鍏宠仈璇锋眰ID")
 	@Column(columnDefinition = "varchar(64) comment '鍏宠仈璇锋眰ID'")
 	private String bwRequestId;
@@ -129,4 +133,17 @@
 	@Schema(description = "棰勬敹寮�绁ㄦ爣璇�")
 	@Column(columnDefinition = "char default '0' comment '0/鍚� 1/鏄�'")
 	private String advanceFlag;
+
+	@Schema(description = "鍙戠エ鏉ユ簮")
+	@Column(columnDefinition="char default '0' comment '鍙戠エ鏉ユ簮 0/绯荤粺鐢熸垚 1/澶栭儴鑾峰彇'")
+	private String invoiceSource;
+
+	@Schema(description = "鏄惁鍚堝苟寮�绁�")
+	@Column(name = "isMerge",columnDefinition="tinyint(1) default 0 comment '鏄惁鍚堝苟寮�绁� 0/鍚� 1/鏄�'")
+	private Boolean isMerge;
+
+	@Schema(description = "鍚堝苟寮�绁ㄥ悎鍚宨d")
+	@Column(columnDefinition="text  comment '鍚堝苟寮�绁ㄥ悎鍚宨d'")
+	private String contractIds;
+
 }

--
Gitblit v1.9.1