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

server-service/src/main/resources/mappers/PlatDeviceMapper.xml

@@ -40,6 +40,9 @@
             <if test="param.orgId != null and param.orgId != '' ">
             <if test="param.orgId != null and param.orgId != '' ">
                 and pd.org_id = #{param.orgId}
                 and pd.org_id = #{param.orgId}
             </if>
             </if>
+            <if test="param.tenantId != null and param.tenantId != ''">
+                and pd.tenant_id = #{param.tenantId}
+            </if>
             <if test="param.orgIds != null and param.orgIds.size() > 0 ">
             <if test="param.orgIds != null and param.orgIds.size() > 0 ">
                 AND pd.org_id in
                 AND pd.org_id in
                 <foreach collection="param.orgIds" item="item" separator="," open="(" close=")" index="">
                 <foreach collection="param.orgIds" item="item" separator="," open="(" close=")" index="">