Merge remote-tracking branch 'origin/master'

# Conflicts: # haiwei-admin/src/main/resources/static/board/board.js
1 year ago · 9a91621f8e
parent d84bc5cb51 91500569b3
commit 9a91621f8e
1 changed files with 1 additions and 1 deletions
--- a/haiwei-admin/src/main/resources/static/board/board.js
+++ b/haiwei-admin/src/main/resources/static/board/board.js
@ -40,7 +40,7 @@ $(() => {
        <div class="win" style="display: none">
          <div class="title">${val.name}</div>
          <div class="span1">${val.data1}: ${val.num1 || 0}${val.unit1}</div>
-          <div class="span2">${val.data2}: ${val.num2 || 0}${val.unit2}</div>
+          <div class="span2">${val.data2}: ${val.num2|| 0}${val.unit2}</div>
        </div>
        <div class="icon" onclick="show(this)"></div>
      </div>