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

wells.liu

2020-07-09 da0da2d1238555c4ff488dbaaae1371ba4cf6827

 src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs

@@ -120,6 +120,7 @@
        {
            Bind.Device = cboDevice.SelectedValue.ToString();
            Bind.OpConfig = propGrid.SelectedObject as IOperationConfig;
            Bind.OpConfig.DeviceId = Bind.Device;
            this.DialogResult = DialogResult.OK;
        }