Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx

@@ -429,11 +429,7 @@ function ConfMes(props) {
             </div>
             <div className="sys-container-right">
                 <div className="sys-table-content">
-                    <ResultFlowResult
+                        <div className="result-info-row">
-                        ajaxLoad={loading}
-                        resultData={resultData?.list || []}
-                    >
-                         <div className="result-info-row">
                              <div>共检索到 {resultData.totalRecords} 条数据</div>
                             <Button
                                 className="add-btn"
@@ -443,6 +439,10 @@ function ConfMes(props) {
                                 消息配置
                             </Button>
                          </div>
+                    <ResultFlowResult
+                        ajaxLoad={loading}
+                        resultData={resultData?.list || []}
+                    >
                         <Table
                             className='sys-table'
                             dataSource={resultData?.list || []}

src/pages/SystemMgm/OrgnizationMgm/loadable.jsx

@@ -542,7 +542,7 @@ function OrgnizationMgm() {
     const treeTitleRender = ({ name, children, level, pid, id, virtually_code, lng_lat, code }) => {
         return <>
             <span className='label-text'>
-                { name + 'kajsndkjand阿里山扩大你' }
+                { name }
             </span>
             <div className="dropdown-tree">
                 <Dropdown