From ccfd4adf5fbc53ca8026234ed7631c2b3961abd6 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 11 三月 2025 17:54:22 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java index fcb986a..859229e 100644 --- a/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java +++ b/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java @@ -6,8 +6,8 @@ import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest; import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse; import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest; import com.doumee.core.erp.model.openapi.request.erp.UserListRequest; import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse; @@ -36,7 +36,7 @@ @RestController @RequestMapping("/erp/resource") @Slf4j -public class ErpResourceController extends ApiController { +public class ErpResourceController{ @ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�") @PostMapping("/org/list") public ERPApiResponse<PageData<ErpOrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) { -- Gitblit v1.9.3