Merge branch 'ft-dev' into 'main'

fix：DEFECT-423 修复设备页面，点击组织筛选返回后，在上拉加载下一页数据错误问题

See merge request huang/thingskit-app!65

@@ -232,6 +232,7 @@ export default {
 		/*下拉刷新的回调 */
 		downCallback() {
 			this.deviceName = '';
+			this.orgId = '';
 			//联网加载数据
 			this.list = [];
 			this.page.num = 1;
@@ -251,7 +252,8 @@ export default {
 				deviceState: deviceState.type ? deviceState.type : undefined,
 				deviceType: deviceType.type ? deviceType.type : undefined,
 				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined,
-				name: this.deviceName == null ? null : this.deviceName
+				name: this.deviceName == null ? null : this.deviceName,
+				organizationId: this.orgId == null ? null : this.orgId
 			});
 		},