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

guoshilong

2023-05-31 8bd367d113a32601c72dd7cf0f8208f59e109160

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -97,8 +97,11 @@
                )
            )
        </if>
        <if test="p_ad_code != null and p_ad_code !='' ">
            and aab."p_ad_code" like CONCAT(#{p_ad_code},'%')
        </if>
        <if test="ad_code != null and ad_code !='' ">
            and aab."ad_code" like CONCAT(#{ad_code},'%')
            and aab."ad_code" = #{ad_code}
        </if>
    </select>