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

kyy

昨天 9010fdfa1f7f6fe29c76111ef95d6383c74ea313

 DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs

@@ -43,9 +43,9 @@
            this.Text = "批量操作【" + this.aboutType + "】,【" + this.aboutGuid + "】";
            switch (aboutType)
            {
                case "托板码":
                /*case "托板码":
                    btnDelete.Visible = false;
                    break;
                    break;*/
                case "追溯码":
                    btnDelete.Visible = false;
                    colT1.Caption = "线体编号";