Merge branch 'master' into master-任务组

陈昶聿

昨天 fcb98e4558897945a316d04555923355b8e60605

 ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java

@@ -39,8 +39,8 @@
                "\"timestamp\": " + timestamp + "," +
                "\"sign\": \"" + sign + "\"" +
                "}";
        String sendMsg=HttpUtil.postJsonRequest(url, jsonMsg);
        return sendMsg;
        Boolean sendMsg=HttpUtil.postJsonRequest(url, jsonMsg);
        return sendMsg.toString();

    }

@@ -66,8 +66,8 @@
                "\"timestamp\": " + timestamp + "," +
                "\"sign\": \"" + sign + "\"" +
                "}";
        String sendMsg=HttpUtil.postJsonRequest(url, jsonMsg);
        return sendMsg;
        Boolean sendMsg=HttpUtil.postJsonRequest(url, jsonMsg);
        return sendMsg.toString();

    }