feat:处理合并代码后的冲突

src/modules/college-manage/LimitTip.tsx

+/*
+ * @Author: your name
+ * @Date: 2021-08-04 15:21:36
+ * @LastEditTime: 2021-08-04 15:27:16
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /xiaomai-cloud-class-web/src/modules/college-manage/LimitTip.tsx
+ */
 import React, { useContext, useEffect, useState } from "react";
 import React, { useContext, useEffect, useState } from "react";
 import { Tooltip } from "antd"
 import { Tooltip } from "antd"
 import { VersionContext } from "@/store/context";
 import { VersionContext } from "@/store/context";
@@ -26,7 +34,7 @@ export default function LimitTip(props:{total:number,type:string,tip:() => React
         {
         {
           isOver ? (
           isOver ? (
             <>
             <>
-            <div style={{marginLeft:"14px",display:"inline-block"}}>{`当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系${window.brandName}服务平台。`}</div>
+            <div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系{window.brandName}服务平台。</div>
             <ContactWidget trigger="hover" placement="bottom">
             <ContactWidget trigger="hover" placement="bottom">
               <div className="renew-text">立即续费<span className="icon iconfont" style={{fontSize:"10px"}}>&#59291;</span></div>
               <div className="renew-text">立即续费<span className="icon iconfont" style={{fontSize:"10px"}}>&#59291;</span></div>
             </ContactWidget>
             </ContactWidget>