Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-14 f979b967a74bfdbfe7d2913a35ba98344838e59b

 screen-job/src/main/resources/mapper/DeviceMapper.xml

@@ -25,6 +25,7 @@
        <result column="install_time" property="installTime"/>
        <result column="is_delete" property="isDelete"/>
        <result column="extend" property="extend"/>
        <result column="town_code" property="townCode"/>
    </resultMap>

</mapper>