Merge remote-tracking branch 'origin/master'

陈昶聿

昨天 b73334e984e391cb2ea6b2651e77bf008e127459

 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java

@@ -126,6 +126,10 @@

    public List<ServiceSubtask> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq);

    public List<ServiceSubtaskStatistic> getSpecialSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq);

    public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq);

    public List<String> getSfStatisticsGroupKey(ServiceSubtaskCountReq serviceSubtaskCountReq);

    public List<ServiceSubtaskCount> getSfStatisticsJoy(ServiceSubtaskCountReq serviceSubtaskCountReq);