Merge remote-tracking branch 'origin/master'

liusheng

21 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java

@@ -147,4 +147,6 @@
    public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);

    public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) ;

    public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);
    }