Merge remote-tracking branch 'origin/master'

hx-file/src/main/java/com/fjhx/file/entity/FileInfoVo.java

@@ -33,4 +33,9 @@ public class FileInfoVo {
      */
     private Long businessId;
 
+    /**
+     * 业务类型
+     */
+    private Long businessType;
+
 }

hx-file/src/main/resources/mapper/file/FileInfoMapper.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.file.mapper.FileInfoMapper">
-    
+
     <select id="getList" resultType="com.fjhx.file.entity.FileInfoVo">
         select fi.id,
                fi.file_url,
                fi.file_name,
-               fi.business_id
+               fi.business_id,
+               fi.business_type
         from file_info fi
             ${ew.customSqlSegment}
     </select>