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

cdk

4 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs

@@ -131,7 +131,6 @@
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                         getPageList(1, 999999);
                    
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
@@ -148,7 +147,6 @@
        ///     选择后的回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;

     
    }
}