Merge branches 'changepassword' and 'master' of http://git.tbd.yanzuoguang.com/pd-new/pd-user

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -553,8 +553,7 @@ public class UserServiceImpl implements UserService {
     public String verifyCodeSend(SaveUserReqVo req) {
         String verifyCode = String.valueOf(new Random().nextInt(899999) + 100000);
         SaveUserReqVo verifySave = new SaveUserReqVo();
-        verifySave.setCompanyId("system");
-        verifySave.setSmsContent("【胖丁】您的验证码为：" + verifyCode + "。五分钟内有效");
+        verifySave.setSmsContent("【重庆胖丁】您的验证码为：" + verifyCode + "。五分钟内有效");
         verifySave.setPhone(req.getPhone());
         verifyCodeCache.put(req.getPhone(), verifyCode);
         distributionProducer.userVerifyCodeSms(verifySave);