Merge remote-tracking branch 'origin/master'

jiangping

2024-12-19 be5a79736ca3711f0ff624bad27df2b743d8f6ac

 screen/src/views/EnergyConsum.vue

@@ -999,7 +999,7 @@
            font-weight: 500;
            margin-right: 6px;
            font-size: 13px;
            width: 64px;
            width: 68px;
          }

          .num {