feat:

# 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-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraUserFavoritesController.java

@@ -11,10 +11,7 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -65,7 +62,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 新增收藏
      */
-    @RequestMapping("add")
+    @PostMapping("add")
     public Result<Boolean> add(@RequestBody SchisandraUserFavoritesDTO schisandraUserFavoritesDTO) {
         try {
             if (log.isInfoEnabled()) {
@@ -85,7 +82,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 修改收藏表
      */
-    @RequestMapping("update")
+    @PostMapping("update")
     public Result<Boolean> update(@RequestBody SchisandraUserFavoritesDTO schisandraUserFavoritesDTO) {
 
         try {
@@ -114,7 +111,7 @@ public class SchisandraUserFavoritesController {
     /**
      * 删除收藏表
      */
-    @RequestMapping("delete")
+    @PostMapping("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,5 +1,6 @@
 package com.schisandra.share.application.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,6 +49,7 @@ public class SchisandraUserFavoritesDTO implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -58,6 +60,7 @@ 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,5 +1,6 @@
 package com.schisandra.share.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -47,6 +48,7 @@ public class SchisandraUserFavoritesBO implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -57,6 +59,7 @@ public class SchisandraUserFavoritesBO 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-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java

@@ -121,7 +121,7 @@ public class SchisandraShareCommentReplyServiceImpl implements SchisandraShareCo
                 .from(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY)
                 .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.DETAIL_ID.eq(detailId))
                 .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.REPLY_TYPE.eq(0))
-                .orderBy(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.REPLY_COUNT.add(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.LIKES) ,false);
+                .orderBy(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.LIKES ,false);
         return this.schisandraShareCommentReplyDao.selectListByQuery(wrapper);
     }