Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/DingTalkAndMessage.java

@@ -195,7 +195,7 @@ public class DingTalkAndMessage {
                 StringBuilder markdown = new StringBuilder();
                 markdown.append("#### ").append(projectName).append(" ").append(workTime).append("h\n\n");
                 markdown.append(workContent).append("\n");
-                contentBuilder.append(markdown);
+                contentBuilder.append(markdown).append("\n\n");
             }
             String completedWork = contentBuilder.toString();
             DingTalkClient client = new DefaultDingTalkClient(dingTalkConstant.DING_TALK_CREATE_DAILY_REPORT_URL);
@@ -265,7 +265,7 @@ public class DingTalkAndMessage {
         SysUser nickName = sysUserMapper.selectOne(nickNameQuery);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("infoTitle", INFO_TITLE);
-        jsonObject.put("infoContent", nickName + INFO_CONTENT);
+        jsonObject.put("infoContent", nickName.getNickName + INFO_CONTENT);
         jsonObject.put("infoType", INFO_TYPE);
         jsonObject.put("id", newReport.getId());
         jsonObject.put("infoTypeName", INFO_TITLE);