Merge branch 'Dev-Branch' into Dev-Wxr

wxr

2023-06-06 92f690c0557409b6c23e6b864a6623912c67df4e

 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs

@@ -114,6 +114,10 @@
                {
                    var inputTypeJOb = new JObject { };
                    inputTypeJOb.Add("sid", dictionary.sid);
                    if (!string.IsNullOrEmpty(dictionary.hold_time))
                    {
                        inputTypeJOb.Add("hold_time", dictionary.hold_time);
                    }
                    inputTypeJOb.Add("condition_type", dictionary.condition_type);
                    if (dictionary.condition_type=="9") {
                        inputTypeJOb.Add("identifier", dictionary.identifier);
@@ -241,6 +245,10 @@
                {
                    var inputTypeJOb = new JObject { };
                    inputTypeJOb.Add("sid", dictionary.sid);
                    if (!string.IsNullOrEmpty(dictionary.hold_time))
                    {
                        inputTypeJOb.Add("hold_time", dictionary.hold_time);
                    }
                    inputTypeJOb.Add("condition_type", dictionary.condition_type);
                    if (dictionary.condition_type == "9")
                    {