Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem into master

storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java

@@ -39,11 +39,13 @@ public class DeviceInfo extends BaseEntity implements Serializable {
 
     @OneToOne
     @JoinColumn(name = "device_type_id",referencedColumnName = "id")
+    @NotFound(action = NotFoundAction.IGNORE)
     @ApiModelProperty(value = "设备类型id")
     private DeviceType deviceTypeId;
 
     @OneToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "device_spec_param_id",referencedColumnName = "id")
+    @NotFound(action = NotFoundAction.IGNORE)
     @ApiModelProperty(value = "设备参数id")
     private DeviceSpecParam deviceSpecParamId;