Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/pages/Hr/Notification/components/MessageDetail.jsx

@@ -1,7 +1,7 @@
 import styles from '@/pages/Hr/Notification/index.less'
 import { Drawer, Tag, Typography } from 'antd'
 import { useIntl } from 'umi'
-import MarkDown from './MarkDown'
+import MarkDown from 'react-markdown'
 
 const MessageDetail = props => {
   const { item: { id, title, createTime, content, msgType } = {}, ...otherProps } = props

src/pages/Hr/Notification/index.jsx

@@ -7,7 +7,7 @@ import consts from '@/consts'
 import { useRequest, useIntl, useAccess } from 'umi'
 import ws, { CmdType } from '@/utils/ws'
 import { useModal } from '@/components/ModalStore'
-import MarkDown from './components/MarkDown'
+import MarkDown from 'react-markdown'
 
 const Notification = () => {
   const intl = useIntl()

src/pages/document.ejs

@@ -37,7 +37,7 @@
           padding: 0;
         }
         #root {
-          background-image: url('<%= context.config.publicPath +"home_bg.png"%>');
+          background-image: url('https://d2.smartcost.com.cn/cach/cld/home_bg.png');
           background-repeat: no-repeat;
           background-size: 100% auto;
         }
@@ -191,7 +191,7 @@
           min-height: 420px;
         "
       >
-        <img src="<%= context.config.publicPath +'zh logo.svg'%>" alt="logo" width="256" />
+        <img src="https://d2.smartcost.com.cn/cach/cld/zh_logo.svg" alt="logo" width="256" />
         <div class="page-loading-warp">
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
             <span class="ant-spin-dot ant-spin-dot-spin"