Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc

# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/root/Menu.tsx

src/data-source/base/request-apis.ts

@@ -49,6 +49,9 @@ export function getEnterpriseUser(params: object) {
 export function getWXWorkLoginNoCheck(params: object) {
   return Service.Hades('anon/hades/getWXWorkLoginNoCheck', params);
 }
+export function getLesseeVersionMsg() {
+  return Service.Hades("public/customerHades/getLesseeVersionMsg",{enterpriseId:User.getEnterpriseId()})
+}
 
 export function getYoZoSign(params: object) {
   return Service.Apollo('public/apollo/getYoZoSign', params);
@@ -59,9 +62,6 @@ export function saveYoZoFileVersionId(params: object) {
 export function yoZoUpload(ossUrl:String,appId:String,uploadSign:String){
   return axios.post(`https://dmc.yozocloud.cn/api/file/http?fileUrl=${ossUrl}&appId=${appId}&sign=${uploadSign}`)
 }
-export function getLesseeVersionMsg() {
-  return Service.Hades("public/customerHades/getLesseeVersionMsg",{enterpriseId:User.getEnterpriseId()})
-}
 export const getOssClient = (
   data: object,
   instId: string,

src/domains/basic-domain/baseService.ts

@@ -55,6 +55,10 @@ export default class StoreService {
   static getWXWorkLoginNoCheck(params: any){
     return getWXWorkLoginNoCheck(params);
   }
+  //获取企业配置的版本信息
+  static getLesseeVersionMsg() {
+    return getLesseeVersionMsg();
+  }
   static getYoZoSign(params:any){
     return new Promise((resolve) => {
       getYoZoSign(params).then(res => {
@@ -69,8 +73,4 @@ export default class StoreService {
   static yoZoUpload(ossUrl:String,appId:String,uploadSign:String){
     return yoZoUpload(ossUrl,appId,uploadSign);
   }
-  //获取企业配置的版本信息
-  static getLesseeVersionMsg() {
-    return getLesseeVersionMsg();
-  }
 }
\ No newline at end of file

src/modules/root/Menu.tsx

-import User from '@/common/js/user';
-import ContactWidget from '@/components/ContactWidget';
+import React, { Key, useContext, useEffect, useRef, useState, useMemo } from 'react';
+import {
+  withRouter,
+} from 'react-router-dom';
+import { Menu, Popover, Tooltip } from 'antd';
+import { RightOutlined } from '@ant-design/icons';
+import { menuList } from '../../routes//config/menuList';
+import { XMContext, VersionContext } from '../../store/context';
+import BaseService from '@/domains/basic-domain/baseService';
 import StoreService from '@/domains/store-domain/storeService';
-import { Menu, Tooltip } from 'antd';
 import classNames from 'classnames';
-import React, { Key, useContext, useEffect, useMemo, useState } from 'react';
-import { withRouter } from 'react-router-dom';
+import User from "@/common/js/user"
 import _ from 'underscore';
-import { menuList } from '../../routes//config/menuList';
-import { VersionContext, XMContext } from '../../store/context';
-import './Menu.less';
+import "./Menu.less";
+import { display } from 'html2canvas/dist/types/css/property-descriptors/display';
+import ContactWidget from '@/components/ContactWidget';
 
 const { SubMenu } = Menu;