From cdf57ef11128f7df6f216c1c717ac783c625fa1b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Apr 2021 17:31:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 8307df0..ced4963 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,5 +1,6 @@
package com.moral.api.controller;
+import com.moral.api.entity.SysArea;
import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.form.account.AccountDeleteForm;
@@ -11,6 +12,7 @@
import com.moral.api.pojo.vo.account.AccountQueryVO;
import com.moral.api.pojo.vo.account.AccountUpdateVO;
import com.moral.api.service.ManageAccountService;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.*;
@@ -18,9 +20,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
@Slf4j
@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
@Autowired
@@ -102,9 +107,5 @@
return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
}
-
-
-
-
}
--
Gitblit v1.8.0