From 3418bfe4aa50fa253dc5a1fed2d9de64319fdb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 28 May 2024 16:25:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?hotfix/2.14.2.2405.02=20=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/style/index.less | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 0d181610..4ce6ef7a 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -71,3 +71,15 @@
     }
   }
 }
+
+//公式编辑框样式
+.excel-codeBox {
+  .cm-variable {
+  }
+
+  .cm-string-2 {
+    color: inherit !important;
+  }
+
+}
+

From 411ba9744bd38a43c1c0cc238fd04edd30dbb0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 28 May 2024 16:42:21 +0800
Subject: [PATCH 2/2] hotfix/2.14.2.2405.02

---
 .../analysisOfSalaryStatistics/components/salaryDetails.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 84882ff0..66538450 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -105,7 +105,7 @@ class SalaryDetails extends Component {
       return;
     }
     WeaLoadingGlobal.start();
-    const promise = API.exportSalaryList({ ...payload, ids: selectedRowKeys });
+    const promise = API.exportSalaryList({ ...payload, ids: key === "SELECTED" ? selectedRowKeys : [] });
   };
   getColumns = () => {
     const { attendanceStore: { tableStore } } = this.props;