Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java

@@ -152,7 +152,7 @@ public class HistoryController {
                         " t_meetingroom_book " +
                         " LEFT JOIN t_meetingroom ON t_meetingroom_book.room_id = t_meetingroom.id  " +
                         "WHERE " +
-                        " state = 1;");
+                        " state != 1 ;");
                 List<ProcessActivityDTO> meetingroom_bookTaskDto = meetingroom_bookTask
                         .stream().map(index -> {
                             ProcessActivityDTO taskDTO = JSON.parseObject(JSON.toJSONString(index), ProcessActivityDTO.class);