Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-14 6ca2f993973295e4da82634761da0e5c00e0ef8e

 src/Bro.Common.Model/Base/DeviceConfigBase.cs

@@ -39,6 +39,14 @@

        [Browsable(false)]
        public string MonitorSetId { get; set; } = "";

        [Browsable(false)]
        [JsonIgnore]
        public virtual string DeviceId { get; set; } = "";

        [Browsable(false)]
        [JsonIgnore]
        public virtual string OutputData { get; set; } = "";
    }

    public class InitialConfigBase : IInitialConfig