Merge remote-tracking branch 'origin/master'

2 months ago · 1630816aa1
1 changed files with 1 additions and 2 deletions
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
@ -94,8 +94,7 @@ public class ScmCollectionRebateVo implements Vo {
    @ApiModelProperty("运费")
    private BigDecimal freight; // 运费
    @ApiModelProperty("回款日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date collectionDate; // 回款日期
+    private String collectionDate; // 回款日期
    @ApiModelProperty("上装金额")
    private BigDecimal topAmount;
    @ApiModelProperty("返利类型key")