Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-23 41fa9a0f2f5cd0ffc9bd96e11f00245ea3567b9b

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -36,7 +36,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="status" property="status" />