From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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..bf738fa 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 = "鍙戠エ绫诲瀷")
@@ -67,7 +67,7 @@
 	private String redReversal;
 
 	@Schema(description = "鍙戠エ鍙风爜")
-	@Column(columnDefinition="varchar(64) comment '寮�绁ㄦ祦姘村彿'")
+	@Column(columnDefinition="varchar(64) comment '鍙戠エ鍙风爜'")
 	private String invoiceNo;
 
 	@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