Merge branch 'master' into master-任务组

陈昶聿

9 天以前 12213c5125aa535811a2b882ea0e78d7e8ee1f8f

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java

@@ -102,6 +102,9 @@
    @Excel(name = " 应随访人次 ")
    private Long followUpNeeded = 0L;

    @ApiModelProperty(value = "首次无需随访")
    private Long nonFollowUpFirst = 0L;

    @ApiModelProperty(value = "首次应随访")
    @Excel(name = " 首次应随访 ")
    private Long needFollowUp = 0L;
@@ -228,6 +231,10 @@
    @Excel(name = " 二次应随访 ")
    private Long needFollowUpAgain = 0L;

    @ApiModelProperty(value = "二次无需随访")
    @Excel(name = " 二次无需随访 ")
    private Long nonFollowUpAgain = 0L;

    @ApiModelProperty(value = "二次待随访")
    @Excel(name = " 二次待随访 ")
    private Long pendingFollowUpAgain = 0L;