From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001 From: 陈昶聿 <chychen@nbjetron.com> Date: 星期五, 06 十一月 2026 13:42:55 +0800 Subject: [PATCH] Merge branch 'master' into smartor_ls_261103 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java index e0a6bed..2571c89 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java @@ -11,9 +11,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysConfigService; import com.smartor.domain.*; -import com.smartor.domain.entity.ServiceSubtaskEntity; -import com.smartor.service.IServiceSubtaskDetailService; -import com.smartor.service.IServiceSubtaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; @@ -26,6 +23,12 @@ import java.util.stream.Collectors; import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log; +import com.ruoyi.task.domain.ServiceSubtask; +import com.ruoyi.task.domain.ServiceSubtaskDetail; +import com.ruoyi.task.domain.ServiceSubtaskDetailVO; +import com.ruoyi.task.service.IServiceSubtaskDetailService; +import com.ruoyi.task.service.IServiceSubtaskService; +import com.ruoyi.task.domain.ServiceSubTaskDetailReq; /** * 璇煶浠诲姟缁撴灉鏄庣粏Controller -- Gitblit v1.9.3