Merge branch 'master' into master-任务组

陈昶聿

昨天 db2a00f5df9990e55ebbdf16cf8c68c3d64fe09d

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

@@ -123,4 +123,6 @@
     * @return 结果
     */
    public void addOperationSubTask(String config);

    public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type);
}