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

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -736,7 +736,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="dangAnList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
-        SELECT u.* from `user` u
+        SELECT DISTINCT u.* from `user` u
         <if test="educationTypeId != null or businessId != null or majorId != null" >
             LEFT JOIN `order` o ON o.user_id = u.user_id and o.`status` = 1
             LEFT JOIN order_goods og ON o.order_sn = og.order_sn AND og.pay_status IN ( 2, 3, 4 ) AND og.refund_status != 2