Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx

@@ -21,13 +21,16 @@ function remarksModal (props) {
     //初始化
     useEffect(() => {
         let myScrollList=ScrollList
-        for (let index = 0; index < cameraRemarks.length; index++) {
+        let sortCameraRemarks =cameraRemarks//排序
-            myScrollList[index].value=cameraRemarks[index].remark
+        sortCameraRemarks.sort((a,b)=>{return a.id-b.id})
+        
+        for (let index = 0; index < sortCameraRemarks.length; index++) {
+            myScrollList[index].value=sortCameraRemarks[index].remark
         }
         setScrollList(myScrollList)
         let mycameraRemarks=[]
-        for (let index = 0; index < cameraRemarks.length; index++) {
+        for (let index = 0; index < sortCameraRemarks.length; index++) {
-            mycameraRemarks.push(cameraRemarks[index].remark)
+            mycameraRemarks.push(sortCameraRemarks[index].remark)
         }
         setShowScrollList(mycameraRemarks)
     }, []);