Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

 package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundPicVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.nustaq.serialization.coders.JSONAsString;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -41,6 +44,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String refundCode;
 
     @ApiModelProperty(value = "成功退款时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime refundAt;
 
     @ApiModelProperty(value = "第三方退款编号")
@@ -67,6 +71,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String applicantName;
 
     @ApiModelProperty(value = "申请时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime applicantAt;
 
     @ApiModelProperty(value = "退款原因")
@@ -79,6 +84,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String auditorName;
 
     @ApiModelProperty(value = "审核时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime auditorAt;
 
     @ApiModelProperty(value = "驳回原因")
@@ -91,6 +97,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String executorName;
 
     @ApiModelProperty(value = "执行时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime executorAt;
 
     @ApiModelProperty(value = "回绝原因")
@@ -101,9 +108,11 @@ public class KylinOrderRefundsVo implements Serializable {
     private Integer refundCate;
 
     @ApiModelProperty(value = "添加时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
     List<KylinOrderRefundsEntitiesDao> entities;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/core/config/SwaggerConfig.java

@@ -57,13 +57,13 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：正在映画管理系统_接口文档")
+                .title("正在映画管理系统接口文档")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("用于管理集团旗下公司的业务信息...")
                 // 作者信息
                 .contact(new Contact(RuoYiConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + RuoYiConfig.getVersion())
+//                .version("版本号:" + RuoYiConfig.getVersion())
                 .build();
     }
 }