Merge branch 'develop'

MyEMS · Jun 11, 2024 · e6bb585 · e6bb585
2 parents 8a560c5 + bcbd249
commit e6bb585
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - fixed totalRatedCapacity and totalRatedPower issue in microgrid dashboard and energy storage power station dashboard
 - fixed issue of meter batch report in myems-api
+- fixed issue of react-bootstrap-table-next in myems-web
 ### Removed
 - removed charge/discharge points and commands from power conversion system of microgrid
 - removed charge/discharge points and commands from power conversion system of energy storage container

diff --git a/myems-web/package-lock.json b/myems-web/package-lock.json
diff --git a/myems-web/package.json b/myems-web/package.json
@@ -50,7 +50,7 @@
     "react": "^16.13.1",
     "react-app-polyfill": "^1.0.6",
     "react-beautiful-dnd": "^13.0.0",
-    "react-bootstrap-table-next": "^1.1.0",
+    "react-bootstrap-table-next": "^4.0.3",
     "react-bootstrap-table2-editor": "^1.4.0",
     "react-bootstrap-table2-paginator": "^2.1.2",
     "react-captcha-code-custom": "^1.0.0",