From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java
index 0b2007b..38ebab8 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java
@@ -24,6 +24,9 @@
@ApiModelProperty(value = "店铺名称")
private String shopName;
+ @ApiModelProperty(value = "员工ID")
+ private Long id;
+
public String getShopName() {
return shopName;
}
@@ -49,10 +52,18 @@
}
public BigDecimal getAmount() {
- return amount;
+ return amount == null ? amount : amount.setScale(BigDecimal.ROUND_DOWN, 2);
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
}
--
Gitblit v1.9.1