Merge branch 'develop' into develop-kjf

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsGdReportMapper.xml

@@ -46,7 +46,7 @@
             and a.user_id = #{userId}
             and b.gd_sn is null
             <if test="posSn != null and posSn != ''">
-                and a.pos_sn like concat('%', #{query.keyword}, '%')
+                and a.pos_sn like concat('%', #{posSn}, '%')
             </if>
         </where>
     </select>