Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei365/user/components/CommonService.java

@@ -58,7 +58,7 @@ public class CommonService {
             if ("dev".equals(profile) || "beta".equals(profile)){
                 redisSmsCode = (null != redisSmsCode && !"null".equals(redisSmsCode) ? redisSmsCode : "666666");
             }
-            if (!redisSmsCode.equals(smsCode)) {
+            if (!smsCode.equals(redisSmsCode)) {
                 return "手机验证码错误";
             }
         }