Merge branch 'main' into dyf-device

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -6,6 +6,11 @@ import lombok.Data;
 public class AppFileVo {
 
     private Long id;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
     /**
      * 文件id
      */

fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">
 
     <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
-        select a.business_id id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
+        select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
         where
         <if test="businessId != null">
             and a.business_id = #{businessId}