From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java
new file mode 100644
index 0000000..4776f27
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java
@@ -0,0 +1,27 @@
+package com.mes.utils.excel;
+
+import java.lang.annotation.*;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 16:51
+ * @Description:
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelMerge {
+    /**
+     * 鏄惁鍚堝苟鍗曞厓鏍�
+     *
+     * @return true || false
+     */
+    boolean merge() default true;
+
+    /**
+     * 鏄惁涓轰富閿紙鍗宠瀛楁鐩稿悓鐨勮鍚堝苟锛�
+     *
+     * @return true || false
+     */
+    boolean isPrimaryKey() default false;
+}

--
Gitblit v1.8.0