Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -570,8 +570,8 @@ namespace CallCenterApi.Interface.Controllers
         string mobile,string phone, string code,   string usercode = "", string pwd = "", string oldPwd = ""
            )
         {
-            if (string.IsNullOrEmpty(code))
-                return Error("请输入短信验证码");
+            //if (string.IsNullOrEmpty(code))
+            //    return Error("请输入短信验证码");
             if (string.IsNullOrWhiteSpace(pwd))
                 return Error("请输入密码");
             if (string.IsNullOrEmpty(company) || string.IsNullOrEmpty(department) || string.IsNullOrEmpty(post)|| string.IsNullOrEmpty(name))
@@ -584,18 +584,18 @@ namespace CallCenterApi.Interface.Controllers
 
             if (string.IsNullOrEmpty(mobile))
                 return Error("请输入手机号码");
-            string msgcount = "你的验证码是" + code + ".十分钟有效.";
-            var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='"+ msgcount+ "' and CallerNum='"+ mobile+ "'order by RecvTime desc");
-            if (sms != null&& sms.Count >0)
-            {
-                var modelSms = sms.First();
-                if ((DateTime.Now - modelSms.RecvTime ).Minutes > 10)
-                {
-                    return Error("验证码已失效");
-                }
-            }
-            else
-                return Error("请获取验证码");
+            //string msgcount = "你的验证码是" + code + ".十分钟有效.";
+            //var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='"+ msgcount+ "' and CallerNum='"+ mobile+ "'order by RecvTime desc");
+            //if (sms != null&& sms.Count >0)
+            //{
+            //    var modelSms = sms.First();
+            //    if ((DateTime.Now - modelSms.RecvTime ).Minutes > 10)
+            //    {
+            //        return Error("验证码已失效");
+            //    }
+            //}
+            //else
+            //    return Error("请获取验证码");
 
             model.F_Password = pwd;
             if (!string.IsNullOrEmpty(name))