Merge remote-tracking branch 'origin/master'

linwe

2024-05-17 1b4822da66a05ee7647f5f86a9f18f15dadb0a25

 src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml

@@ -20,6 +20,7 @@
            <if test="nursingCheckIn.placeId != null ">and place_id = #{nursingCheckIn.placeId}</if>
            <if test="nursingCheckIn.type != null  and nursingCheckIn.type != ''">and type = #{nursingCheckIn.type}</if>
        </where>
        order by id desc
    </select>