Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isShow != null  ">and is_show = #{isShow}</if>
             <!--<if test="qwRepeat != null  ">and qw_repeat = #{qwRepeat}</if>
             <if test="userRepeat != null  ">and user_repeat = #{userRepeat}</if>-->
-            <if test="payOrder != null  ">and pay_order = #{payOrder}</if>
+<!--            <if test="payOrder != null  ">and pay_order = #{payOrder}</if>-->
         </where>
     </select>