Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java

@@ -425,7 +425,7 @@ public class ActHistoryService {
                     }
                 }
             } else {
-                logger.info("不存在正在进行流程节点");
+                logger.info("不存在正在进行流程节点:" + index.getProcessInstanceId());
                 index.setAllowReminders(Boolean.FALSE);
                 index.setDoneReminders(Boolean.FALSE);
                 index.setNextRemindersDays(0);

renren-admin/src/main/resources/db/V8.3__add_table.sql

@@ -8,7 +8,7 @@ create TABLE `sys_audit_team`  (
   `name` longtext NOT NULL comment '审核组名称',
   `member` json NOT NULL comment '审核组成员id数组',
   `index` varchar(255) NULL comment '审核组索引',
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`id`)
-  INDEX `name`(`name`) USING BTREE comment '审核组名称索引'
 ) comment = '流程审核组组员';
+alter table `sys_audit_team` ADD INDEX `name_`(`name`) USING BTREE comment '审核组名称索引';
 SET FOREIGN_KEY_CHECKS = 1;