Merge branch 'develop'

CHANGELOG.md

@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed save button issue of energy item dialog in myems-admin
 - fixed validator issue of equipment parameter form in myems-admin
 - fixed validator issue of combined equipment parameter form in myems-admin
+- fixed webpack-dev-server version 4.12.0 caused compile errors
 
 ### Removed
 

myems-api/run.sh

-#!/bin/sh
-
 gunicorn -b 0.0.0.0:8000 --pid pid --timeout 600 --workers=4 app:api
\ No newline at end of file

myems-web/package.json

@@ -108,6 +108,7 @@
     "gulp-sourcemaps": "^2.6.5",
     "postcss": "^8.0.0",
     "prettier": "1.17.1",
-    "sass": "^1.43.4"
+    "sass": "^1.43.4",
+    "webpack-dev-server": "4.11.1"
   }
 }