From ec36eca8c8e09045f4879d69926712ecd16d4bc3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 十二月 2023 17:04:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index e35b20c..42ab067 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
@@ -3,6 +3,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.model.request.erp.ApproveAddRequest;
import com.doumee.model.request.erp.OrgListRequest;
import com.doumee.model.request.erp.UserListRequest;
import com.doumee.model.response.CarEventListResponse;
@@ -42,7 +43,7 @@
}
@ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�")
@PostMapping("/event/approve/apply")
- public ApiResponse<String> approveApply(@RequestBody Object account ) {
+ public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest account ) {
return ApiResponse.success(UUID.randomUUID().toString());
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉鏌ヨ鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾煡璇㈣瀹㈢敵璇峰鎵圭粨鏋�")
--
Gitblit v1.9.3