From 19f5f603fb890e84e43fadcf3135e660802026d0 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期二, 28 六月 2022 14:51:13 +0800
Subject: [PATCH] 解决冲突
---
src/app/modules/business/controller/admin/taskimmediately.ts | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/app/modules/business/controller/admin/taskimmediately.ts b/src/app/modules/business/controller/admin/taskimmediately.ts
index 7a50129..0b9890b 100644
--- a/src/app/modules/business/controller/admin/taskimmediately.ts
+++ b/src/app/modules/business/controller/admin/taskimmediately.ts
@@ -1,7 +1,7 @@
import { ALL, Body, Get, Inject, Post, Provide, Query } from '@midwayjs/decorator';
import { CoolController, BaseController } from '@cool-midway/core';
import { Taskimmediately } from '../../entity/taskimmediately';
-import { TaskimmediatelyService } from '../../../business/service/taskimmediately';
+import { Immediatetask } from '../../service/immediatetask';
import { DataController } from '../../../base/controller/dataController';
import { SocketHandler } from '../../../../../socket/socketHandle';
import { RpcService } from '../../../base/service/dataapi/rpcservice';
@@ -19,14 +19,11 @@
*/
@Provide()
@CoolController({
- api: ['delete', 'update', 'list', 'page', 'info'],
+ api: ['add', 'delete', 'update', 'list', 'page', 'info'],
entity: Taskimmediately,
- // service: TaskimmediatelyService,
+ service: Immediatetask,
})
export class TaskimmediatelyController extends DataController {
-
- @Inject()
- taskimmediatelyService: TaskimmediatelyService;
@Inject()
socketHandler: SocketHandler
--
Gitblit v1.9.1