Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 dee2cf1591b135c9bf75dcaf81a96ee48435b5f9

 ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml

@@ -52,7 +52,7 @@
    </update>

    <delete id="deleteArdAppPatroluserByReserved1" parameterType="String">
        delete from ard_app_patroluser where reserved_1 = #{reserved1}
        delete from ard_app_patroluser where patrolplan_id = #{id}
    </delete>

    <delete id="deleteArdAppPatroluserByReserved1s" parameterType="String">