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

cdk

3 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs

@@ -43,8 +43,7 @@

            var _obj = new
            {
                edtUserGuid = userGuid,
                userGuid,
                userGuid = userGuid,
                newPass = txtNewPwd.Text.Trim()
            };
            try