From 0b0b8419586505154a7e57e7c32c9a44329347ce Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:01:56 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_gybjyhglxt
---
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 5fb2c7a..499d75a 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -31,7 +31,6 @@
* 鍛樺伐id
*/
@ApiModelProperty("鍛樺伐id")
- @Excel(name = "鍛樺伐id")
private Long staffId;
/**
--
Gitblit v1.9.3