更改

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java

@@ -26,11 +26,13 @@
 package com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +54,11 @@ public class AppSpecialRebateWithApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("创建组织名称")
     private String createOrgName;
     @ApiModelProperty("申请部门名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java

@@ -54,13 +54,17 @@ public class AppSpecialrebateCheckapplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
     @ApiModelProperty("核对申请标题")
     private String checkApply;
     @ApiModelProperty("申请部门名称")
     private String deptName;
     @ApiModelProperty("创建人姓名")
     private String createByName;
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("创建日期")
     private Date createTime;
     @ApiModelProperty("备注")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java

@@ -19,7 +19,6 @@ import java.util.List;
  * @Date
  * @Description
  */
-@Api(tags = "售后盘盈入库")
 @FeignClient(
         contextId = "terminal-AppSpecialrebateCheckapply",
         name = "anrui-terminal",

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java

@@ -52,6 +52,10 @@ public class AppSpecialrebateCheckapplydetailDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("返利类型value")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialRebateDisGetVehVo.java

@@ -50,6 +50,6 @@ public class AppSpecialRebateDisGetVehVo implements Query {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date salesDate;
     @ApiModelProperty(value = "买断日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date solidDate;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeDetailsVo.java

@@ -55,11 +55,13 @@ public class AppSpecialrebatedistributeDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门名称")
     private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("创建日期")
     private Date createTime;
     @ApiModelProperty("创建组织名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehRebateDetailsVo.java

@@ -63,6 +63,8 @@ public class AppVehRebateDetailsVo implements Vo {
     private Date createTime; // 创建日期
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java

@@ -54,6 +54,10 @@ public class AppVehrebateCheckapplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("核对申请标题")
     private String checkApply;
     @ApiModelProperty("部门")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java

@@ -52,6 +52,10 @@ public class AppVehrebateCheckapplydetailDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty("返利类型value")
     private String rebateTypeValue;
     @ApiModelProperty("预提日期")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateDetailsVo.java

@@ -63,6 +63,8 @@ public class AppVehRebateDetailsVo implements Vo {
     private Date createTime; // 创建日期
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java

@@ -26,11 +26,13 @@
 package com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +54,11 @@ public class AppVehRebateWithApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("创建日期")
+    private Date createTime;
     @ApiModelProperty("部门")
     private String deptName;
     @ApiModelProperty("创建组织名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java

@@ -53,6 +53,10 @@ public class AppVehRebateWithDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
     @ApiModelProperty("返利类型value")
     private String rebateTypeValue;
     @ApiModelProperty("台数")