Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/resources/mapper/HistoryMapper.xml

@@ -177,10 +177,10 @@
    </insert>



    <delete id="deleteHistoryData" parameterType="java.lang.String">

        delete from history3 where  time &lt; #{oldTime};

        delete from history where  time &lt; #{oldTime};

    </delete>

    <update id="deletePartition">

        ALTER table history3 drop PARTITION ${p};

        ALTER table history drop PARTITION ${p};

    </update>



</mapper>