From 242fad1691917c4fd82c7f04b6190a7113628e93 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 11 三月 2022 15:31:04 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit

---
 pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java
index ee805b5..9d2b05f 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java
@@ -8,34 +8,31 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.PersonalNotification;
-import com.pollex.pam.enums.NotificationTypeEnum;
-import com.pollex.pam.enums.PersonalNotificationRoleEnum;
-import com.pollex.pam.repository.PersonalNotificationRepository;
-import com.pollex.pam.security.SecurityUtils;
-import com.pollex.pam.service.ConsultantService;
-import com.pollex.pam.service.PersonalNotificationService;
+import com.pollex.pam.business.domain.Consultant;
+import com.pollex.pam.business.domain.PersonalNotification;
+import com.pollex.pam.business.enums.PersonalNotificationRoleEnum;
+import com.pollex.pam.business.repository.PersonalNotificationRepository;
+import com.pollex.pam.business.security.SecurityUtils;
+import com.pollex.pam.business.service.ConsultantService;
+import com.pollex.pam.business.service.PersonalNotificationService;
 
 @RestController
 @RequestMapping("/api/personal_notification")
 public class PersonalNotificationResource {
-	
+
 	@Autowired
 	PersonalNotificationService personalNotificationService;
-	
+
 	@Autowired
 	PersonalNotificationRepository personalNotificationRepository;
-	
+
 	@Autowired
 	ConsultantService consultantService;
-	
+
 	@GetMapping("/getMyPersonalNotification")
 	public ResponseEntity<List<PersonalNotification>> getMyPersonalNotification() {
 		List<PersonalNotification> personalNotificationList = new ArrayList<>();
@@ -47,7 +44,7 @@
 		}
 		return new ResponseEntity<>(personalNotificationList, HttpStatus.OK);
 	}
-	
+
 	@PostMapping("/readAllMyNotification")
 	public void readAll() {
 		personalNotificationService.readAllMyNotification();

--
Gitblit v1.8.0