Merge branch 'refs/heads/dev' into test

share-front/src/main/java/share/web/controller/system/EquityFundExcessController.java

 package share.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import share.common.annotation.Log;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import share.common.core.controller.BaseController;
-import share.common.core.domain.AjaxResult;
 import share.common.core.page.TableDataInfo;
-import share.common.enums.BusinessType;
-import share.common.utils.poi.ExcelUtil;
 import share.system.domain.EquityFundExcess;
 import share.system.domain.SConsumer;
 import share.system.domain.vo.EquityFundExcessVo;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.service.EquityFundExcessService;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,7 +30,6 @@ public class EquityFundExcessController extends BaseController
     /**
      * 查询权益金过度列表
      */
-    @PreAuthorize("@ss.hasPermi('system:equityFundExcess:list')")
     @GetMapping("/list")
     public TableDataInfo list(EquityFundExcessVo equityFundExcess)
     {

share-system/src/main/java/share/system/domain/EquityFundExcess.java

 package share.system.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
-import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
 /**
  * 权益金过度对象 s_equity_fund_excess
  * 
@@ -41,8 +41,8 @@ public class EquityFundExcess extends BaseEntity
     private String outTradeNo;
 
     /** 过期时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date expireTime;
 
     //逻辑删除注解(0 未删除 1 已删除)