Merge remote-tracking branch 'origin/master'

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="paramMap.stateList != null  and paramMap.stateList != ''">
             and f.zfi_status IN (${paramMap.stateList})
-        </if>R
+        </if>
         <if test="paramMap.finaceStatus != null  and paramMap.finaceStatus != ''">
             and f.zfi_status = #{paramMap.finaceStatus}
         </if>