Merge remote-tracking branch 'refs/remotes/origin/dev'

# Conflicts:
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java

@@ -41,6 +41,8 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static com.schisandra.oss.infra.basic.entity.table.SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP;
+
 /**
  * controller
  *

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraUserFavoritesController.java

@@ -11,7 +11,10 @@ import com.schisandra.share.domain.bo.SchisandraShareDetailBO;
 import com.schisandra.share.domain.bo.SchisandraUserFavoritesBO;
 import com.schisandra.share.domain.service.SchisandraUserFavoritesDomainService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -62,7 +65,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 新增收藏
      */
-    @PostMapping("add")
+    @RequestMapping("add")
     public Result<Boolean> add(@RequestBody SchisandraUserFavoritesDTO schisandraUserFavoritesDTO) {
         try {
             if (log.isInfoEnabled()) {
@@ -82,7 +85,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 修改收藏表
      */
-    @PostMapping("update")
+    @RequestMapping("update")
     public Result<Boolean> update(@RequestBody SchisandraUserFavoritesDTO schisandraUserFavoritesDTO) {
 
         try {
@@ -111,7 +114,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 删除收藏表
      */
-    @PostMapping("delete")
+    @RequestMapping("delete")
     public Result<Boolean> delete(@RequestBody SchisandraUserFavoritesDTO schisandraUserFavoritesDTO) {
 
         try {

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraUserFavoritesDTO.java

@@ -1,6 +1,5 @@
 package com.schisandra.share.application.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -49,7 +48,6 @@ public class SchisandraUserFavoritesDTO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -60,7 +58,6 @@ public class SchisandraUserFavoritesDTO implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraUserFavoritesBO.java

@@ -1,6 +1,5 @@
 package com.schisandra.share.domain.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,7 +47,6 @@ public class SchisandraUserFavoritesBO implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -59,7 +57,6 @@ public class SchisandraUserFavoritesBO implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**