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

wells.liu

2020-07-10 67c0c0d55c193d00ef6f3481e1f081d236bcab13

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

@@ -43,6 +43,10 @@
        [Browsable(false)]
        [JsonIgnore]
        public virtual string DeviceId { get; set; } = "";

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

    public class InitialConfigBase : IInitialConfig