Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/XiaoyuanNotice.java

@@ -60,12 +60,12 @@ public class XiaoyuanNotice extends TenantEntity {
     /**
      * 可见班级id
      */
-    private String classIdKejian;
+    private String classIdKeJian;
 
     /**
      * 不可见班级id
      */
-    private String classIdBukejian;
+    private String classIdBuKeJian;
 
     /**
      * 发件人id

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/bo/XiaoyuanNoticeBo.java

@@ -67,13 +67,13 @@ public class XiaoyuanNoticeBo extends BaseEntity {
      * 可见班级id
      */
     //@NotBlank(message = "可见班级id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String classIdKejian;
+    private String classIdKeJian;
 
     /**
      * 不可见班级id
      */
     //@NotBlank(message = "不可见班级id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String classIdBukejian;
+    private String classIdBuKeJian;
 
     /**
      * 发件人id

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/notice/XiaoyuanNoticeServiceImpl.java

@@ -157,8 +157,8 @@ public class XiaoyuanNoticeServiceImpl implements IXiaoyuanNoticeService {
         lqw.eq(StringUtils.isNotBlank(bo.getNoticeContent()), XiaoyuanNotice::getNoticeContent, bo.getNoticeContent());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XiaoyuanNotice::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), XiaoyuanNotice::getType, bo.getType());
-        lqw.eq(StringUtils.isNotBlank(bo.getClassIdKejian()), XiaoyuanNotice::getClassIdKejian, bo.getClassIdKejian());
-        lqw.eq(StringUtils.isNotBlank(bo.getClassIdBukejian()), XiaoyuanNotice::getClassIdBukejian, bo.getClassIdBukejian());
+        lqw.eq(StringUtils.isNotBlank(bo.getClassIdKeJian()), XiaoyuanNotice::getClassIdKeJian, bo.getClassIdKeJian());
+        lqw.eq(StringUtils.isNotBlank(bo.getClassIdBuKeJian()), XiaoyuanNotice::getClassIdBuKeJian, bo.getClassIdBuKeJian());
         lqw.eq(StringUtils.isNotBlank(bo.getSenderId()), XiaoyuanNotice::getSenderId, bo.getSenderId());
         lqw.like(StringUtils.isNotBlank(bo.getSenderName()), XiaoyuanNotice::getSenderName, bo.getSenderName());
         lqw.eq(StringUtils.isNotBlank(bo.getSenderDept()), XiaoyuanNotice::getSenderDept, bo.getSenderDept());