From 0b8b3be32067368f4c8ca8812f69a7b3f48f1ce8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 26 八月 2025 17:05:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index b185332..36ea120 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -65,10 +65,6 @@
@ApiModelProperty(value = "鍥炲寮傚父鏁�")
private Long hfycs = 0L;
- @ApiModelProperty(value = "鍙婃椂鐜�")
- @Excel(name = " 鍙婃椂鐜� ")
- private Double rate = 0.0;
-
/**
* 06-04鏂扮粺璁￠〉闈㈠瓧娈�
*/
@@ -114,6 +110,10 @@
@ApiModelProperty(value = "棣栨闅忚澶辫触")
@Excel(name = " 棣栨闅忚澶辫触 ")
private Long followUpFail = 0L;
+
+ @ApiModelProperty(value = "鍙婃椂鐜�")
+ @Excel(name = " 鍙婃椂鐜� ")
+ private Double rate = 0.0;
@ApiModelProperty(value = "棣栨闅忚鐜�")
@Excel(name = " 棣栨闅忚鐜� ")
@@ -161,9 +161,9 @@
@ApiModelProperty(value = "浜屾鐭俊")
@Excel(name = " 浜屾鐭俊 ")
private Long smsAgain = 0L;
+ @Excel(name = " 浜屾寰俊 ")
@ApiModelProperty(value = "浜屾寰俊")
- @Excel(name = " 浜屾寰俊 ")
private Long weChatAgain = 0L;
@ApiModelProperty(value = "缁撴灉寮傚父")
@@ -172,4 +172,11 @@
@ApiModelProperty(value = "绉戝鐥呭尯")
private Integer statisticaltype;
+
+
+ @ApiModelProperty(value = "鍖荤敓缂栫爜")
+ private String drcode;
+
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
}
--
Gitblit v1.9.3