Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -142,6 +142,7 @@ public class TicketServiceImpl implements ITicketService {
             tpTicketVO.setRepairName(repairName);
             tpTicketVO.setStatus(recordList.get(0).getStatus());
             tpTicketVO.setTicketStatusName(recordList.get(0).getTicketStatusName());
+            tpTicketVO.setTicketRecordDate(recordList.get(0).getCreateDate());
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -58,6 +58,9 @@ public class TpTicketVO {
     /** 流程状态名称 **/
     private String ticketStatusName;
 
+    /** 流程状态时间 **/
+    private Date ticketRecordDate;
+
     /** 最新进展 **/
     private String commentContent;