Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/MessageReceiverDTO.java

@@ -19,4 +19,7 @@ public class MessageReceiverDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeName;
 }

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/MessageInfoApiController.java

@@ -124,6 +124,10 @@ public class MessageInfoApiController {
                 dto.setTitle(messageInfo.getTitle());
                 dto.setContent(messageInfo.getContent());
 
+                MessageType messageType = messageTypeService.get(messageInfo.getType());
+                if(messageType!=null){
+                    dto.setTypeName(messageType.getName());
+                }
             }
             dto.setCreateTime(messageReceiver.getCreateTime());