|
@@ -76,6 +76,7 @@
|
|
|
<result column="stock" property="stock"/>
|
|
<result column="stock" property="stock"/>
|
|
|
<result column="after_fill_stock" property="afterFillStock"/>
|
|
<result column="after_fill_stock" property="afterFillStock"/>
|
|
|
<result column="stock_status" property="stockStatus"/>
|
|
<result column="stock_status" property="stockStatus"/>
|
|
|
|
|
+ <result column="is_use_battery" property="isUseBattery"/>
|
|
|
</association>
|
|
</association>
|
|
|
<association property="deviceRegister" javaType="com.xy.dto.DeviceRegisterDto$Vo">
|
|
<association property="deviceRegister" javaType="com.xy.dto.DeviceRegisterDto$Vo">
|
|
|
<result column="register_num" property="registerNum"/>
|
|
<result column="register_num" property="registerNum"/>
|
|
@@ -145,6 +146,7 @@
|
|
|
status.stock,
|
|
status.stock,
|
|
|
status.after_fill_stock,
|
|
status.after_fill_stock,
|
|
|
status.stock_status,
|
|
status.stock_status,
|
|
|
|
|
+ status.is_use_battery,
|
|
|
mp.place_name,
|
|
mp.place_name,
|
|
|
ml.line_name as place_line_name,
|
|
ml.line_name as place_line_name,
|
|
|
sr.name as district_name
|
|
sr.name as district_name
|
