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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FinancingInfoHistoryDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +37,7 @@ public class FinancingInfoHistoryDto  extends BaseDto {
     private Long peasantHouseholdId;
 
     @ApiModelProperty(value = "放款时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date disbursementTime;
 
     @ApiModelProperty(value = "元")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoHistoryServiceImpl.java

@@ -79,7 +79,7 @@ public class FinancingInfoHistoryServiceImpl extends BaseService<FinancingInfoHi
             e.setDisbursementTime(financingInfoDto.getDisbursementTime());
             e.setUnitPrice(financingInfoDto.getUnitPrice());
             e.setFinancingCompaniesName(financingInfoDto.getFinancingCompaniesName());
-            e.setStatus("已完成");
+            e.setStatus("放款完成");
             if (financingInfoDto.getFiles() != null){
                 e.setFile(JSON.toJSONString(financingInfoDto.getFiles()));
             }