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

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -239,6 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enforce == '1'.toString()"> and r.check_css is not null</if>
             <if test="checkCategory != null  and checkCategory != ''"> and r.check_category = #{checkCategory}</if>
             <if test="checkCss != null  and checkCss != ''"> and r.check_css = #{checkCss}</if>
+            <if test="lawEnforcementItemText != null  and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%',  #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
             </if>