Home Explore Help
Register Sign In
lijin
/
xy-device
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into test

李进 1 year ago
parent
3b1f8f0ca1 d84e89ec22
commit
2d34687439
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      device-api-service/src/main/resources/mapper/DeviceChargingMapper.xml

+ 1 - 1
device-api-service/src/main/resources/mapper/DeviceChargingMapper.xml
View File 

@@ -25,7 +25,7 @@
 
             <result column="merc_name" property="mercName"/>
 
             <result column="merc_name" property="mercName"/>
 
             <result column="create_time" property="createTime"/>
 
             <result column="create_time" property="createTime"/>
 
             <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
 
             <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
 
-                <result column="net_type" property="netType"/>
 
+                <result column="net_state" property="netState"/>
 
             </association>
 
             </association>
 
         </association>
 
         </association>
 
         <association property="deviceCharging" javaType="com.xy.dto.DeviceChargingDto$Vo">
 
         <association property="deviceCharging" javaType="com.xy.dto.DeviceChargingDto$Vo">