Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

3 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -50,6 +50,9 @@
        <result column="standby1" property="standby1" />
        <result column="standby2" property="standby2" />
        <result column="standby3" property="standby3" />
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
    </resultMap>

</mapper>