Merge remote-tracking branch 'origin/master'

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java

@@ -50,6 +50,7 @@ public class TreeNode {
     private Integer maCount;
 
     private String remark;
+    private Integer maintenanceAlarmDay;
 
     private List<MaTypeProperty> maTypeProperties;
 

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

@@ -218,19 +218,19 @@ public class DevInfo extends BaseEntity {
     @NotEmpty(message = "详情页展示图不能为空")
     private List<BmFileInfo> detailsFileList = new ArrayList<>();
 
-    @ApiModelProperty(value = "检测证明、检验pdf")
+    @ApiModelProperty(value = "检测证明pdf")
     private List<List<BmFileInfo>> examinationPdfs = new ArrayList<>();
 
-    @ApiModelProperty(value = "检测证明、检验pdf")
+    @ApiModelProperty(value = "检测证明pdf")
     private List<BmFileInfo> examinationPdf = new ArrayList<>();
 
     @ApiModelProperty(value = "唯一标识符列表")
     private List<String> identifyCodes = new ArrayList<>();
 
-    @ApiModelProperty(value = "合格证、保险pdf")
+    @ApiModelProperty(value = "合格证pdf")
     private List<List<BmFileInfo>> insurancePdfs = new ArrayList<>();
 
-    @ApiModelProperty(value = "合格证、保险pdf")
+    @ApiModelProperty(value = "合格证pdf")
     private List<BmFileInfo> insurancePdf = new ArrayList<>();
 
     /**文件附件*/

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaTypeInfoList" resultType="com.bonus.common.biz.domain.TreeNode">
         select type_id as id, parent_id as parentId, type_name as name, `level` as level, manage_type as manageType,lease_price as leasePrice,
-               unit_name as unitName
+               unit_name as unitName,maintenance_alarm_day as maintenanceAlarmDay
         from ma_type
         where del_flag = '0'
     </select>