Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java

@@ -233,4 +233,8 @@ public class DevInfo extends BaseEntity {
     @ApiModelProperty(value = "公司Id")
     @NotBlank(message = "所属公司不能为空")
     private String companyId;
+
+    @ApiModelProperty(value = "管理方式(0编号 1计数)")
+    private String manageType;
+
 }

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.brand             as brand,
                d.model_name        as modelName,
                mt.type_name        as typeName,
+               mt.manage_type      as manageType,
                d.production_date   as productionDate,
                d.working_hours     as workingHours,
                d.serial_number     as serialNumber,