Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/workspace.xml

Entity/DeviceModel.py

@@ -1,3 +1,5 @@
+from getpass import fallback_getpass
+
 
 # 设备模型
 class DeviceModel(object):
@@ -16,6 +18,7 @@ class DeviceModel(object):
         # 1 添加 2删除
         self.type = type
         self.ready = False
+        self.deleting = False
 
     # 转字典
     def toDict(self):