From 75fab7170e1f26b83b0f31d65d4e164ca3bba107 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 17 七月 2024 08:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
index 8197478..aadffd9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
@@ -22,7 +22,7 @@
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
</resultMap>
- <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife" extends="BaseResultMap">
+ <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" extends="BaseResultMap">
<result property="planName" column="plan_name" jdbcType="VARCHAR"/>
<result property="stationName" column="station_name" jdbcType="VARCHAR"/>
<result property="updateUserName" column="update_user_name" jdbcType="VARCHAR"/>
--
Gitblit v1.8.0