diff --git a/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs b/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
index 733773a..1a52d77 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
@@ -31,7 +31,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceConfigVMs
                 .GetSelectListItems(Wtm, y => y.DeviceName);
             if (Entity.DeviceId != null)
             {
-                if (Entity.EnumInfo != null)
+                //if (Entity.EnumInfo != null)
+                if (!string.IsNullOrEmpty( Entity.EnumInfo))
                 {
                     AllTypes = new List<ComboSelectListItem>();
                     var EnumInfos = JsonSerializer.Deserialize<Dictionary<string, int>>(Entity.EnumInfo);
diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs
index a5629d0..1d0a742 100644
--- a/Plugins/Plugin/MyMqttClient.cs
+++ b/Plugins/Plugin/MyMqttClient.cs
@@ -481,6 +481,11 @@ namespace Plugin
                         case IoTPlatformType.IoTSharp:
                             foreach (var payload in SendModel[device.DeviceName])
                             {
+                                //if (payload.Values.ContainsKey("ts"))
+                                //    payload.Values["ts"] = payload.TS;
+                                //else
+                                //    payload.Values.Add("ts",payload.TS);
+
                                 UploadISTelemetryDataAsync(device.DeviceName, payload.Values);
                             }
                             break;