Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-02 d7e498f5e1f13e37df52ebd08c98e8a833b9c450

 src/main/java/org/springblade/modules/patrol/mapper/PatrolRecordMapper.xml

@@ -204,6 +204,7 @@
<!--        <result property="isDeleted"    column="is_deleted"    />-->
<!--    </resultMap>-->


    <sql id="selectPatrolRecord">
       select
           id,
@@ -214,11 +215,15 @@
           image_urls,
           create_user,
           create_time,
           is_deleted
           is_deleted,
           rectification_image_urls,
           rectification_remark,
           rectification_time
      from
           jczz_patrol_record
    </sql>


<!--    <select id="selectPatrolRecordById" parameterType="long" resultMap="PatrolRecordDTOResult">-->
<!--        <include refid="selectPatrolRecord"/>-->
<!--        where-->