moral.git - Gitblit

			@@ -26,6 +26,7 @@
			<result column="is_delete" property="isDelete"/>
			<result column="extend" property="extend"/>
			<result column="town_code" property="townCode"/>
			<result column="dev_num" property="devNum"/>
			</resultMap>

			<resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">
			@@ -67,8 +68,8 @@

			<!--乡镇街道-->
			<association property="town" javaType="java.util.HashMap">
			<result column="town_code" property="areaCode"/>
			<result column="town_name" property="name"/>
			<result column="town_code" property="townCode"/>
			<result column="town_name" property="townName"/>
			</association>

			<!--设备维护人-->
			@@ -250,7 +251,10 @@
			on
			d.`device_version_id` = oua.`version_id` and d.`organization_id` = oua.`organization_id` and oua.`is_delete` = 0
			where
			d.`is_delete` = 0;
			d.`is_delete` = 0
			<if test="mac != null and mac != '' ">
			and d.mac = #{mac}
			</if>
			</select>