Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java

@@ -66,7 +66,11 @@ public class SelectWorktrayrealtimeinfoController extends BaseController {
         List<TRpWorktrayrealtimeinfo> list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo);
         for (TRpWorktrayrealtimeinfo tw:list)
         {
-            tw.setProductCode(tw.getBarcoderelationship().getProductBarcode());
+            if(tw.getBarcoderelationship()!=null){
+                if (tw.getBarcoderelationship().getProductBarcode()!=null){
+                    tw.setProductCode(tw.getBarcoderelationship().getProductBarcode());
+                }
+            }
         }
         ExcelUtil<TRpWorktrayrealtimeinfo> util = new ExcelUtil<TRpWorktrayrealtimeinfo>(TRpWorktrayrealtimeinfo.class);
         return util.exportExcel(list, "托盘实时信息");

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java

@@ -32,7 +32,7 @@ public class TRpWorktrayrealtimeinfo extends BaseEntity
     private String currentStation;
 
     /** 质量品级 */
-    @Excel(name = "质量品级(1合格，2不合格)")
+//    @Excel(name = "质量品级(1合格，2不合格)")
     private Long state;
 
     /** 使用状态 */