Merge remote-tracking branch 'origin/master'

renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 操作日志
@@ -54,7 +55,9 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysLogOperationEntity entity) {
+        CompletableFuture.runAsync(() -> {
             insert(entity);
+        });
     }
 
 }

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -210,7 +210,7 @@ public class ResourceController {
     @ApiOperation("导入")
     @LogOperation("导入")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "source", value = "请求来源", paramType = "string", dataType = "string")
+            @ApiImplicitParam(name = "file", value = "数据文件文件", paramType = "file", dataType = "file")
     })
     public Result importResource(@RequestParam("file") MultipartFile uploadFile, HttpServletRequest request) {
         List<Map<String, Object>> dept =

renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java

@@ -36,7 +36,7 @@ public class WorkDynamicsDTO implements Serializable {
     private Long updater;
     @ApiModelProperty(value = "修改时间")
     private Date updateDate;
-    @ApiModelProperty(value = "备用字段1")
+    @ApiModelProperty(value = "摘要")
     private String note1;
     @ApiModelProperty(value = "备用字段2")
     private String note2;

renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java

@@ -59,7 +59,7 @@ public class WorkDynamicsEntity {
 	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Date updateDate;
 	/**
-	* 备用字段1
+	* 摘要
 	*/
 	private String note1;
 	/**

renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java

@@ -36,7 +36,7 @@ public class WorkDynamicsExcel {
     private Long updater;
     @ExcelProperty(value = "修改时间", index = 8)
     private Date updateDate;
-    @ExcelProperty(value = "备用字段1", index = 9)
+    @ExcelProperty(value = "摘要", index = 9)
     private String note1;
     @ExcelProperty(value = "备用字段2", index = 10)
     private String note2;

renren-admin/src/main/resources/db/V1.4__tb_work_dynamics_update_note1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `share_platform`.`tb_work_dynamics` 
+MODIFY COLUMN `note1` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '摘要' AFTER `update_date`;