Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionEvent.java

@@ -83,6 +83,11 @@ public class PatrolInspectionEvent implements Serializable {
      */
     private LocalDateTime handleTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 租户号
      */

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionEventMapper.xml

@@ -16,6 +16,7 @@
         <result column="device_id" property="deviceId" />
         <result column="handle_name" property="handleName" />
         <result column="handle_time" property="handleTime" />
+        <result column="remark" property="remark" />
         <result column="tenant_id" property="tenantId" />
         <result column="dept_id" property="deptId" />
         <result column="create_by" property="createBy" />