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

shenyijian

2024-06-20 11cbff75d8b18ce599a05cbb4d84cec104583358

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml

@@ -25,10 +25,10 @@
            and sst.content like concat('%',#{smsResult.templateContent},'%')
        </if>
        <if test="smsResult.startTime!=null and smsResult.startTime!=''">
            and date_format(ssr.create_time,'%Y-%m-%d') >= #{smsResult.startTime}
            and ssr.create_time >= #{smsResult.startTime}
        </if>
        <if test="smsResult.endTime!=null and smsResult.endTime!=''">
            and date_format(ssr.create_time,'%Y-%m-%d') &lt;= #{smsResult.endTime}
            and ssr.create_time &lt;= #{smsResult.endTime}
        </if>
        <if test="smsResult.smsType!=null and smsResult.smsType!=''">
            and sst.sms_type = #{smsResult.smsType}