From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java | 11 ++++++++++-
1 files changed, 10 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 94df9ef..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 = "鍙戠エ绫诲瀷")
@@ -137,4 +137,13 @@
@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