Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 937e0e7a3c06aea55d42350268c1aba8e3264eb3

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

@@ -198,4 +198,6 @@
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime);

    public String scanGenerateSubtask(ServiceTask serviceTaskVo);
}