Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

7 天以前 800f1652b2ed0473850975efe5028685bcd605c4

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1787,8 +1787,10 @@
                // column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
                column.OptionsFilter.ImmediateUpdateAutoFilter = false;
                if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
                if (column.Tag == null || column.Tag.ToString().EndsWith("edit") || column.Name== "colChkInt")
                {
                    column.OptionsColumn.ReadOnly = false;
                }
                else
                    column.OptionsColumn.ReadOnly = true;