Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-05-25 affff835d01de682a503eee8b71d48bf35255a50

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.xml

@@ -8,6 +8,13 @@
        <if test="smsRecord.phone!=null and smsRecord.phone!=''">
            and phone like concat(concat('%',#{smsRecord.phone}),'%')
        </if>
        <if test="smsRecord.content!=null and smsRecord.content!=''">
            and content like concat(concat('%',#{smsRecord.content}),'%')
        </if>
        <if test="smsRecord.templateId!=null and smsRecord.templateId!=''">
            and template_id like concat(concat('%',#{smsRecord.templateId}),'%')
        </if>
        order by id desc
    </select>

</mapper>