|
|
@@ -30,7 +30,6 @@
|
|
|
</association>
|
|
|
<association property="deviceCharging" javaType="com.xy.dto.DeviceChargingDto$Vo">
|
|
|
<result column="charging_sum_money" property="chargingSumMoney" />
|
|
|
- <result column="charging_x" property="chargingX" />
|
|
|
<result column="timeout" property="timeout" />
|
|
|
<result column="last_charging_time" property="lastChargingTime" />
|
|
|
<result column="charging_create_time" property="createTime" />
|
|
|
@@ -40,7 +39,7 @@
|
|
|
<select id="page" resultMap="queryPageMap">
|
|
|
select di.*,
|
|
|
ds.net_state,
|
|
|
- dc.charging_sum_money, dc.charging_x, dc.timeout, dc.last_charging_time, dc.create_time as charging_create_time
|
|
|
+ dc.charging_sum_money, dc.timeout, dc.last_charging_time, dc.create_time as charging_create_time
|
|
|
from device_info di
|
|
|
join device_status ds on (di.device_id = ds.device_id)
|
|
|
join device_charging dc on(di.device_id = dc.device_id)
|
