From a7f132bc723df88c95b469260eb79ac247463442 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 九月 2025 19:00:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
index 90e48f1..fa24dc7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
@@ -32,10 +32,16 @@
private Long count;
@ApiModelProperty(value = "濉啓婊℃剰搴︽暟閲�")
- private Long joyCount;
+ private Integer joyCount;
@ApiModelProperty(value = "鎵�鏈夋弧鎰忓害鏁伴噺")
- private Long joyAllCount;
+ private Integer joyAllCount;
+
+ @ApiModelProperty(value = "婊℃剰搴︽瘮渚�")
+ private String joyTotal;
+
+ @ApiModelProperty(value = "婊℃剰搴﹀悕绉�")
+ private String joyName;
public ServiceSubtaskCount(String month, Long serviceType, Long count) {
this.serviceType = serviceType;
--
Gitblit v1.9.3