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
|