Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

api/app/lib/controllers/alarm/data.js

@@ -49,7 +49,7 @@ async function list (ctx) {
             whereOption.push(`alarms.AlarmGroup IN (${groupId})`)
          }
          if (groupUnitId) {
-            whereOption.push(`alarms.AlarmGroupUnit=${groupId}`)
+            whereOption.push(`alarms.AlarmGroupUnit=${groupUnitId}`)
          }
          if (sustainTimeStart && sustainTimeEnd) {
             let momentStart = moment(sustainTimeStart).format()

web/package.json

@@ -47,7 +47,7 @@
       "vite": "^2.9.5"
    },
    "dependencies": {
-      "@douyinfe/semi-ui": "2.8.0",
+      "@douyinfe/semi-ui": "^2.20.0",
       "@douyinfe/semi-webpack-plugin": "^2.13.0",
       "@micro-zoe/micro-app": "^1.0.0-alpha.1",
       "@peace/utils": "^0.0.64",