Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml

@@ -67,8 +67,7 @@
    <select id="selectOrgByMac" resultType="com.moral.api.entity.Organization">
        SELECT area_code, city_code
        FROM organization
        WHERE organization_id =
              (SELECT organization_id FROM special_device WHERE mac = #{mac})
        WHERE id = (SELECT organization_id FROM special_device WHERE mac = #{mac})
    </select>

</mapper>