Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="month != null  and month != ''"> and month = #{month}</if>
-            <if test="jdsj != null "> and jdsj = #{jdsj}</if>
+            <if test="jdsj != null "> and jdsj like concat( #{jdsj}, '%')</if>
             <if test="jdannr != null  and jdannr != ''"> and jdannr = #{jdannr}</if>
             <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
             <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>