From 72396cbbb60d0418dd4cb63f310532fc70a28c10 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 16 Mar 2021 17:59:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java index c1d410d..b769ec7 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java @@ -1,13 +1,12 @@ package com.matrix.system.fenxiao.vo; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; @Data @ApiModel(value = "LoadSetOrderListDtoVo", description = "返回类") @@ -27,10 +26,10 @@ @ApiModelProperty(value = "结算时间") private Date setTime; @ApiModelProperty(value = "结算人") - private Integer setMan; + private String setMan; @ApiModelProperty(value = "结算方式") private BigDecimal settlementWay; @ApiModelProperty(value = "备注") - private Integer remark; + private String remark; } -- Gitblit v1.9.1