Merge remote-tracking branch 'origin/master'

# Conflicts:
#	productionboard/target/classes/static/js/aluminumLiner/index.js

productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java

@@ -131,7 +131,7 @@ public class AluminumLinerkController {
     @GetMapping("/getStatisticalOutputByModel")
     @ResponseBody
     public String getStatisticalOutputByModel() {
-        List<DeviceFault> list=iMesProductionDataService.selectDeviceFaultByType("铝内胆");
+        List<DeviceFault> list=iMesProductionDataService.selectDeviceFaultByType("1#内胆吸附机");
         return JSONArray.toJSONString(list);
     }
 

productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java

@@ -3,9 +3,7 @@ package com.productionboard.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.productionboard.entity.AluminumDevice.AluminumDeviceDataInformation;
+
-import com.productionboard.entity.AluminumDevice.AluminumThisMonthEnergy;
-import com.productionboard.entity.AluminumDevice.AluminumYesterdayEnergy;
 import com.productionboard.entity.TankShellDevice.*;
 import com.productionboard.mapper.*;
 import com.productionboard.service.ITankShellDeviceInfoService;

productionboard/target/classes/static/js/aluminumLiner/index.js

@@ -39,7 +39,6 @@ $(() => {
         dataType: 'JSON',
         success: function (res) {
             let Res = {}
-            console.log(res)
 
             Res.data=res.map(val => {
                 return [val.spe,val.aq,val.oq,val.cha,val.round,]