Merge remote-tracking branch 'origin/master'

Administrator

2021-04-23 0b9ceeec9c387b1499486468779b5c67bec00113

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/depl/mapper/DeplMapper.xml

@@ -7,7 +7,7 @@
        <id column="id" property="id"/>
        <result column="deviceNumber" property="devicenumber"/>
        <result column="contacts" property="contacts"/>
        <result column="call" property="call"/>
        <result column="call" property="calls"/>
        <result column="paddress" property="paddress"/>
        <result column="deploymentTime" property="deploymenttime"/>
        <result column="deviceName" property="devicename"/>