Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-26 cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d

 java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml

old mode 100644
new mode 100755
@@ -254,7 +254,7 @@
        <if test="direction !=null and direction != ''">
            , t.direction = #{direction}
        </if>
        <if test="heartbeatTime !=null and heartbeatTime != ''">
        <if test="heartbeatTime !=null ">
            , t.heartbeat_time = #{heartbeatTime}
        </if>
        where 1=1