From d9a6f3907ca1d15a4277462f97a43d3778160d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 25 Sep 2023 16:20:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?hotfix/2.9.42310.01=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/analysisOfSalaryStatistics/components/conditions.js   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index a622aefb..7bcac916 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -50,7 +50,6 @@ export const condition = [
         options: [],
         viewAttr: 2,
         helpfulTip: "",
-        hide: true
       },
       {
         colSpan: 1,
@@ -92,7 +91,6 @@ export const reportCondition = [
         rules: "required|string",
         viewAttr: 3,
         helpfulTip: "",
-        hide: true
       }
     ],
     title: "",

From 00d285e5beb82afd694fa5d4f3fb47bf7b973de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sat, 7 Oct 2023 15:38:33 +0800
Subject: [PATCH 2/2] hotfix/2.9.42310.01

---
 pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
index c87cd3ab..e985ac5a 100644
--- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
+++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
@@ -1,4 +1,5 @@
 import { WeaTools } from "ecCom";
+import { convertToUrlString } from "../util/url";
 
 // 工资单列表
 export const mySalaryBillList = params => {
@@ -25,7 +26,13 @@ export const recordList = params => {
 
 // 工资查看详情
 export const mySalaryBill = params => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/mySalaryBill", "GET", params);
+  return fetch(`/api/bs/hrmsalary/salaryBill/mySalaryBill?${convertToUrlString(params)}`, {
+    method: "GET",
+    mode: "cors",
+    headers: {
+      "Content-Type": "application/json"
+    }
+  }).then(res => res.json());
 };
 
 export const isNeedSecondPwdVerify = params => {