Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/resources/mapper/DeviceVersionMapper.xml

@@ -24,10 +24,6 @@
                (
                   SELECT id FROM monitor_point mpt
                   WHERE mpt.organization_id = #{orgId,jdbcType=INTEGER}
                        or EXISTS (
                        SELECT * from dictionary_data where dict_data_key = 'auth_config_super_org' and dict_data_value = #{orgId,jdbcType=INTEGER}
                        )

                )
              )
          order by dvn.create_time desc