Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-09 279df6a13a6889020d27e391069879887142b755

 management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html

@@ -381,6 +381,10 @@
      // orderByMonth(new Date().getMonth() + 1)
      // orderByYear(new Date().getFullYear())
      // queryOrderCount()
      setInterval(function () {
         console.log(1111111111)
         getData()
      }, 30000);
   })

   function selectYear(e){