Merge remote-tracking branch 'origin/main'

zhongrj

2023-03-07 c3d3acc1f7f02caee2cc7dfe47ef8217ffcb7965

 src/main/java/com/genersoft/iot/vmp/netty/business/mapper/TalkBackEquipmentMapper.java

@@ -32,7 +32,7 @@
     * @param code
     * @return
     */
    @Select("select * from sys_talk_back_equipment where code = #{code}")
    @Select("select * from sys_talk_back_equipment where terminal_number = #{code}")
    TalkBackEquipment getTalkBackEquipment(String code);

    /**