Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java

@@ -110,7 +110,8 @@ public class TRemindersServiceImpl extends CrudServiceImpl<TRemindersDao, TRemin
                 logger.info("无流程创建者");
                 return;
             }
-            String content = "【催办通知】" + dto.getSponsor().getRealName() + "发起的流程 " + resourceName + dto.getProcessType() +
+            SysUserDTO creatorDto = sysUserService.get(Long.parseLong(creator));
+            String content = "【催办通知】" + creatorDto.getRealName() + "发起的流程 " + resourceName + dto.getProcessType() +
                     " 已进入审核节点：" + task.getName() +
                     "；当前审核人指派为您";
             if (allowEntrust) {

renren-admin/src/main/resources/db/V8.0__create_reminders.sql

@@ -12,6 +12,8 @@ CREATE TABLE `t_reminders`  (
   `additional1` varchar(255) NULL COMMENT '附加备用字段1',
   `additional2` longtext NULL COMMENT '附加备用字段2',
   `additional3` longtext NULL COMMENT '附加备用字段3',
+  `creator` bigint NOT NULL COMMENT '创建人',
+  `create_date` datetime NOT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '催办信息' ROW_FORMAT = DYNAMIC;
 alter table `t_reminders` ADD INDEX `instance_id`(`instance_id`) USING BTREE comment '催办流程实例ID';