Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/NoticePub.vue

@@ -103,7 +103,7 @@ export default {
         return message.warning("请输入公告内容");
       } else {
         let obj = {
-          notice: state.noticeContent1,
+          notice: state.noticeContent,
           projectId: props.projectId,
           title: "",
         };
@@ -147,7 +147,7 @@ export default {
 .noticeTitle {
   margin-left: 32px;
   margin-right: 32px;
-  // padding-top: 20px;
+  margin-bottom: 100px;
   .notitle {
     height: 55px;
     border-bottom: 1px solid #ededed;

src/views/courselibrary/CoursewareManage.vue

@@ -2861,7 +2861,7 @@ const columns1 = [
     },
   },
   {
-    title: "上线时间",
+    title: "发布时间",
     width: 160,
     dataIndex: "pubtime",
     key: "10",