Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 e27305d6720bb4238307731f95c03e5e38f19380

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

@@ -114,6 +114,7 @@
                {
                    var inputTypeJOb = new JObject { };
                    inputTypeJOb.Add("sid", dictionary.sid);
                    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 +242,7 @@
                {
                    var inputTypeJOb = new JObject { };
                    inputTypeJOb.Add("sid", dictionary.sid);
                    inputTypeJOb.Add("hold_time", dictionary.hold_time);
                    inputTypeJOb.Add("condition_type", dictionary.condition_type);
                    if (dictionary.condition_type == "9")
                    {