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

cdk

3 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs

@@ -572,6 +572,7 @@
            this.repositoryItemComboBox3Sql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox3Sql.Items.AddRange(new object[] {
            "-请选择-",
            "字符串类型",
            "数值类型",
            "时间类型",