Merge branch 'updat' into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml

@@ -8,9 +8,7 @@
         WHERE role & #{mask} >0 and m.is_valid=1
         AND o.type = 0
         ]]>
-        <if test="org_id!=null and org_ids==null">and m.org_id=#{org_id}</if>
+        <if test="org_id!=null">and m.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and m.org_id in
-            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
     <select id="listAvailable" resultType="com.alibaba.fastjson.JSONObject">
         SELECT manager_id,