预警学院id提交

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/WarningNoticeLogVO.java

@@ -50,11 +50,18 @@ public class WarningNoticeLogVO {
     @ApiModelProperty("实验室名称")
     private String subName;
 
+    @ApiModelProperty("学院Id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
     @ApiModelProperty("楼栋名称")
     private String buildName;
 
     @ApiModelProperty("楼层Id")
     private Long floorId;
+
     @ApiModelProperty("楼层名称")
     private String floorName;
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/WarningNoticeLogMapper.xml

@@ -49,7 +49,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply_user, apply_time, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, voice_broadcast, remark, dispose, location_state, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
+        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, college_id, college_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply_user, apply_time, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, voice_broadcast, remark, dispose, location_state, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
     </sql>
 
     <select id="selectWarningNoticelist"