Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
 import com.yxt.common.core.vo.Vo;
@@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,6 +57,9 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("申请人sid")
     private String createBySid; // 申请人sid
     @ApiModelProperty("备注")