From 6f89cbc3ec018995b13b6952cc95bb47d9c75b6c Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Mon, 28 Jun 2021 17:11:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'mesnac/master'

# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
#	dispatch/src/main/resources/mapper/UserResourceMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/BomMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/BomService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/BomServiceImpl.java
#	meapi/src/main/resources/mapper/BomMapper.xml
---
 .../java/com/foreverwin/mesnac/meapi/model/Bom.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
index bd58d50f..cc0a2841 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
@@ -69,7 +71,16 @@ public class Bom extends Model<Bom> {
    private LocalDateTime partitionDate;
    @TableField("MODEL")
    private String model;
+   @TableField(exist = false)
+   private List<BomComponent> bomComponentList;
+
+   public List<BomComponent> getBomComponentList() {
+      return bomComponentList;
+   }
 
+   public void setBomComponentList(List<BomComponent> bomComponentList) {
+      this.bomComponentList = bomComponentList;
+   }
 
    public String getHandle() {
       return handle;