Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/DeviceManager/index.js

@@ -264,7 +264,7 @@ const Device = ({ projectId }) => {
         <img className={styles.img} src={deviceIcon} />
         <div>
           <div className={styles.num}>{allData?.total}</div>
-          <div className={styles.text}>设备总数</div>
+          <div className={styles.text}>设备总数（个）</div>
         </div>
       </div>
       <Space className={styles.btns} size={28}>

src/pages/DeviceManager/index.less

@@ -71,8 +71,6 @@
     .btn {
       width: 147px;
       height: 59px;
-      // background: #e8e8e8;
-      border-radius: 10px;
       font-size: 30px;
       color: #4a4a4a;
       line-height: 59px;

src/pages/MessageCenter/index.js

@@ -34,7 +34,7 @@ const MessageCenter = () => {
 
   const renderItem = (item) => {
     const time = item?.CreatedOn
-      ? dayjs(item.CreatedOn).format('YYYY-MM-DD hh:mm')
+      ? dayjs(item.CreatedOn).format('YYYY-MM-DD HH:mm')
       : '';
     return (
       <div className={`card-box ${styles.itemContent}`}>

src/pages/Smart/components/SimulateDetail.less

@@ -117,6 +117,12 @@
   justify-content: space-between;
   align-items: center;
   margin-bottom: 30px;
+  :global {
+    .ant-select .ant-select-arrow {
+      font-size: 24px;
+      color: black;
+    }
+  }
 }
 
 .dateTabs {