Merge branch 'dev' of province-qinghai/province-all into master

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorNvr/mapper/mapping/MonitorNvrMapper.xml

@@ -40,7 +40,7 @@
         FROM
             monitor_camera camera
                 LEFT JOIN camera_storehouse s on s.camera_id = camera.id
-        WHERE camera.isremove = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR}
+        WHERE camera.isremove = '1' AND camera.org_id = #{orgId}
         group by camera.id
     </select>
 </mapper>