Merge branch 'Dev' into 'master'

Dev

See merge request mooctest-company/mooctest-org-backend!2

src/main/java/mooctest/org/backend/site/data/vo/NotificationVO.java

@@ -21,6 +21,7 @@ public class NotificationVO {
     private int isThirdParty;
     private int deletedStatus;
     private Timestamp createTime;
+    private int year;
 
     public NotificationVO(Notification notification){
         BeanUtils.copyProperties(notification, this);

src/main/java/mooctest/org/backend/site/domainObject/Notification.java

@@ -25,6 +25,7 @@ public class Notification {
     private int deletedStatus;
     private int isChangingCreateTime = 0;
     private Timestamp createTime;
+    private int year;
 
 
     public Notification createNotification(){

src/main/java/mooctest/org/backend/site/model/NotificationPO.java

@@ -43,4 +43,6 @@ public class NotificationPO implements Serializable {
     @Column(name = "N_CREATE_TIME")
     private Timestamp createTime;
 
+    @Column(name = "N_YEAR")
+    private int year;
 }

src/main/java/mooctest/org/backend/site/service/NotificationService.java

@@ -97,6 +97,7 @@ public class NotificationService {
     }
 
     public boolean checkPassword(String password) {
+        log.info("输入的密码为：{}", password);
         return correctPassword.equals(password);
     }
 }

src/main/resources/application.yml

@@ -38,7 +38,7 @@ logging:
     org.springframework.web.reactive: DEBUG
     reactor.ipc.netty: DEBUG
 
-password: WWW.MOOCTEST.ORG123$
+password: K3orhR&guzeZh4=Fh
 
 limit:
   count: 7