From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
index 34ab1ba..f49580e 100644
--- a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
+++ b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
@@ -1,8 +1,5 @@
 package com.vci.starter.poi.bo;
 
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-
 import java.util.List;
 
 /**
@@ -107,7 +104,6 @@
 	 */
 	private Integer width;
 
-
 	public String getFontColor() {
 		return fontColor;
 	}
@@ -145,6 +141,37 @@
 	}
 
 	/**
+	 * 鏋勯�犳柟娉�-鏄惁灞呬腑
+	 * @param row 琛�
+	 * @param col 鍒�
+	 * @param obj 鍊�
+	 */
+	public WriteExcelData(int row, int col, boolean center, Object obj){
+		this.row = row;
+		this.col = col;
+		this.center = center;
+		this.obj = obj;
+	}
+
+	/**
+	 * 鏋勯�犳柟娉�-鍚堝苟锛屽眳涓弬鏁�
+	 * @param row 琛�
+	 * @param rowTo 鍚堝苟琛�
+	 * @param merged 鏄惁鍚堝苟鍗曞厓鏍�
+	 * @param center 鏄惁灞呬腑
+	 * @param col 鍒�
+	 * @param obj 鍊�
+	 */
+	public WriteExcelData(int row,int rowTo,boolean merged,boolean center, int col, Object obj){
+		this.row = row;
+		this.rowTo = rowTo;
+		this.merged = merged;
+		this.center = center;
+		this.col = col;
+		this.obj = obj;
+	}
+
+	/**
 	 * 鍐欏叕寮�
 	 * @param row 琛屽彿 浠�0 寮�濮�
 	 * @param col 鍒楀彿浠�0寮�濮�

--
Gitblit v1.9.3