Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/AdminDao.xml

@@ -28,7 +28,7 @@
         at.name as tagName,
         a.is_out as isOut,
         a.is_hide_important as isHideImportant,
-        a.is_control_early_warning as isHideImportant
+        a.is_control_early_warning as isControlEarlyWarning
         FROM admin a left join admin_tag at on at.id = a.tag_id
         <where>
             <if test="type == 1">