From ab5840c3ec845fcce9011cf4ee8cec051fbb52c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Thu, 8 Jan 2026 14:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/bmw/BmWorkerContractMapper.xml | 5 -----
 .../src/main/resources/mapper/bmw/PmWorkerMapper.xml         | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml
index 197a0eb..b34e66d 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml
@@ -10,17 +10,12 @@
     <result column="contract_stop_date" property="contractStopDate" />
     <result column="wage_approved_way" property="wageApprovedWay" />
     <result column="wage_criterion" property="wageCriterion" />
-    <result column="day_rate" property="dayRate" />
     <result column="contract_upload_date" property="contractUploadDate" />
     <result column="contract_invalid_date" property="contractInvalidDate" />
-    <result column="create_user" property="createUser" />
-    <result column="update_user" property="updateUser" />
     <result column="pro_name" property="proName" />
     <result column="team_name" property="teamName" />
     <result column="sub_name" property="subName" />
     <result column="pro_Id" property="proId" />
-    <result column="team_id" property="teamId" />
-    <result column="sub_id" property="subId" />
     <result column="name" property="name" />
     <result column="id_number" property="idNumber" />
     <result column="isSign" property="isSign" />
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
index d1c7d99..6a4967a 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
@@ -440,7 +440,7 @@
     </if>
     GROUP BY
       pw.id,bwem.pro_id
-    order by contractFile ASC
+    order by contractFile
 
     </select>
 </mapper>