Merge branch 'wei_master' into '105'

update

See merge request !21

src/main/java/com/server/web/common/service/Impl/InformationServiceImpl.java

@@ -75,7 +75,18 @@ public class InformationServiceImpl implements InformationService {
     @Override
     public Map<String, Object> informationDetail(Long informationId) {
         TKzyInformation tKzyInformation = tKzyInformationMapper.selectByPrimaryKey(informationId);
-        return returnMap("1", "", tKzyInformation);
+        tKzyInformation.getContent();
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.put("id", tKzyInformation.getId());
+        dataMap.put("title", tKzyInformation.getTitle());
+        dataMap.put("author", tKzyInformation.getAuthor());
+        dataMap.put("picUrl", tKzyInformation.getPicUrl());
+        dataMap.put("iconUrl", tKzyInformation.getIconUrl());
+        dataMap.put("isDelete", tKzyInformation.getIsDelete());
+        dataMap.put("createDt", tKzyInformation.getCreateDt());
+        dataMap.put("updateDt", tKzyInformation.getUpdateDt());
+        dataMap.put("content", new String(tKzyInformation.getContent()));
+        return returnMap("1", "", dataMap);
     }
 
     @Override